赋值码增加各个阶段

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/LandOneCodeController.java

@@ -61,6 +61,8 @@ public class LandOneCodeController extends BaseController {
         }
     }
 
+
+
     /**
      * 删除（按ID）
      */
@@ -73,4 +75,18 @@ public class LandOneCodeController extends BaseController {
             return R.fail(e.getMessage());
         }
     }
+
+    @PostMapping("/addEntity")
+    public R<String> addEntity(@RequestBody LandOneCode body) {
+        try {
+            service.addOrUpdateLandOneCodeInfo(body.getProjectWorkflowId());
+            return R.ok(body.getProjectWorkflowId());
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/LandOneCodeService.java

@@ -20,7 +20,7 @@ public interface LandOneCodeService {
 
     String getBusinessCode(String projectWorkflowId, Integer ProjectType);
 
-    String addOrUpdateLandOneCodeInfo(String projectWorkflowId, Integer projectType);
+    String addOrUpdateLandOneCodeInfo(String projectWorkflowId);
 
 
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/Gyjsydjfwscdjmpl.java

@@ -9,6 +9,7 @@ import com.siwei.apply.domain.vo.GyjsydjfwscdjVo;
 import com.siwei.apply.mapper.GyjsydjfwscdjMapper;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.service.GyjsydjfwscdjService;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,8 @@ public class Gyjsydjfwscdjmpl implements GyjsydjfwscdjService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    LandOneCodeService landOneCodeService;
+
     @Override
     public Boolean isExit(String projectId) {
         return gyjsydjfwscdjMapper.isExit(projectId);
@@ -73,6 +76,9 @@ public class Gyjsydjfwscdjmpl implements GyjsydjfwscdjService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return gyjsydjfwscdj.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/GyjsydscdjImpl.java

@@ -9,6 +9,7 @@ import com.siwei.apply.domain.vo.GyjsydscdjVo;
 import com.siwei.apply.mapper.GyjsydscdjMapper;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.service.GyjsydscdjService;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,6 +41,9 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    @Autowired
+    private LandOneCodeService landOneCodeService;
+
     @Override
     public Boolean isExit(String projectId) {
         return gyjsydscdjMapper.isExit(projectId);
@@ -73,6 +77,8 @@ public class GyjsydscdjImpl implements GyjsydscdjService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return gyjsydscdj.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsgcghxkImpl.java

@@ -9,6 +9,7 @@ import com.siwei.apply.domain.vo.JsgcghxkVo;
 import com.siwei.apply.mapper.JsgcghxkMapper;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.service.JsgcghxkService;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +40,8 @@ public class JsgcghxkImpl implements JsgcghxkService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    LandOneCodeService landOneCodeService;
+
     @Override
     public Boolean isExit(String projectId) {
         return jsgcghxkMapper.isExit(projectId);
@@ -72,6 +75,8 @@ public class JsgcghxkImpl implements JsgcghxkService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getTableName());
         projectWorkflowMapper.add(projectWorkflow);
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return jsgcghxk.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsydghxkImpl.java

@@ -8,6 +8,7 @@ import com.siwei.apply.domain.vo.JsydghxkVo;
 import com.siwei.apply.mapper.JsydghxkMapper;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.service.JsydghxkService;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,8 @@ public class JsydghxkImpl implements JsydghxkService {
     private ProjectWorkflowMapper projectWorkflowMapper;
     @Autowired
     private WorkflowMapper workflowMapper;
+    @Autowired
+    private LandOneCodeService landOneCodeService;
 
     @Override
     public Boolean isExit(String projectId) {
@@ -68,6 +71,9 @@ public class JsydghxkImpl implements JsydghxkService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return jsydghxk.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/LandOneCodeServiceImpl.java

@@ -115,7 +115,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
         String licenseStagesCode = replaceCode;
 
         //单独选址
-        if(ProjectType.ALONE.equals(projectType)){
+        if(ProjectType.ALONE.getCode().equals(String.valueOf(projectType))){
             Tdgy globalTdgy = null; //土地供应对象
             //取征转状态
             //优先获取土地供应的值
@@ -174,7 +174,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
             } else if(currentNodeTableList.contains(talbeName5)){
                 licenseStagesCode = "1";
             }
-        }else if(ProjectType.BATCH.equals(projectType)){
+        }else if(ProjectType.BATCH.getCode().equals(String.valueOf(projectType))){
             Tdgy globalTdgy = null; //土地供应对象
             //取征转状态
             //优先获取土地供应的值
@@ -229,20 +229,20 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
     }
 
 
-
     /**
      * 各个环节新增时，新增一条地块一码信息
      * @param projectWorkflowId
-     * @param projectType
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addOrUpdateLandOneCodeInfo(String projectWorkflowId, Integer projectType) {
+    public String addOrUpdateLandOneCodeInfo(String projectWorkflowId) {
         ProjectWorkflow  projectWorkflow= projectWorkflowMapper.selectById(projectWorkflowId);
         String nodeId = projectWorkflow.getNodeId();
         String projectId = projectWorkflow.getProjectId();
         Project project =projectMapper.get(projectId);
+        Integer projectType = project.getProjectType();
+
         // 获取地块ID
         NodeLand nodeLand = nodeLandMapper.selectByNodeId(nodeId);
         String landCodeId = nodeLand.getId();

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java

@@ -7,6 +7,7 @@ import com.siwei.apply.domain.vo.TdgyUpdateVo;
 import com.siwei.apply.domain.vo.TdgyVo;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.TdgyMapper;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.TdgyService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,10 @@ public class TdgyImpl implements TdgyService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    @Autowired
+    private LandOneCodeService landOneCodeService;
+
+
     @Override
     public Boolean isExit(String projectId) {
         return tdgyMapper.isExit(projectId);
@@ -77,6 +82,8 @@ public class TdgyImpl implements TdgyService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return tdgy.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdhyhsImpl.java

@@ -8,6 +8,7 @@ import com.siwei.apply.domain.vo.TdhyhsUpdateVo;
 import com.siwei.apply.domain.vo.TdhyhsVo;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.TdhyhsMapper;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.TdhyhsService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,9 @@ public class TdhyhsImpl implements TdhyhsService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    @Autowired
+    private LandOneCodeService landOneCodeService;
+
     @Override
     public Boolean isExit(String projectId) {
         return tdhyhsMapper.isExit(projectId);
@@ -71,6 +75,8 @@ public class TdhyhsImpl implements TdhyhsService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return tdhyhs.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TjyydhxImpl.java

@@ -11,6 +11,7 @@ import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.mapper.TjyydhxMapper;
 import com.siwei.apply.mapper.WorkflowMapper;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.TjyydhxService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,9 @@ public class TjyydhxImpl implements TjyydhxService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    @Autowired
+    private LandOneCodeService landOneCodeService;
+
     @Override
     public Boolean isExit(String projectId) {
         return tjyydhxMapper.isExit(projectId);
@@ -58,6 +62,8 @@ public class TjyydhxImpl implements TjyydhxService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return tjyydhx.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdbpImpl.java

@@ -7,6 +7,7 @@ import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdbpVo;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.YdbpMapper;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.YdbpService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,9 @@ public class YdbpImpl implements YdbpService {
     @Autowired
     private WorkflowMapper workflowMapper;
 
+    @Autowired
+    private LandOneCodeService landOneCodeService;
+
     @Override
     public Boolean isExit(String projectId) {
         return ydbpMapper.isExit(projectId);
@@ -74,6 +78,8 @@ public class YdbpImpl implements YdbpService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return ydbp.getId();
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/YdysyxzImpl.java

@@ -11,6 +11,7 @@ import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.mapper.WorkflowMapper;
 import com.siwei.apply.mapper.YdysyxzMapper;
+import com.siwei.apply.service.LandOneCodeService;
 import com.siwei.apply.service.YdysyxzService;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,8 @@ public class YdysyxzImpl implements YdysyxzService {
     private ProjectWorkflowMapper projectWorkflowMapper;
     @Autowired
     private WorkflowMapper workflowMapper;
+    @Autowired
+    private LandOneCodeService landOneCodeService;
 
     @Override
     public Boolean isExit(String projectId) {
@@ -59,6 +62,9 @@ public class YdysyxzImpl implements YdysyxzService {
         projectWorkflow.setNodeTableName(workflow.getTableName());
         projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
+
+        //这里增加赋码数据
+        landOneCodeService.addOrUpdateLandOneCodeInfo(projectWorkflow.getId());
         return ydysyxz.getId();
     }
 

siwei-modules/siwei-apply/src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/siwei-apply" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.siwei" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>