Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -256,6 +256,9 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
                 case "saber":
                     result = "4"; //manger=后管
                     break;
+                case "hac":
+                    result = "5"; //hac=成本管控系统
+                    break;
             }
         }
 
@@ -263,6 +266,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
                 || (("2").equals(result) && user.getUserType().contains("2")) //app
                 || (("3").equals(result) && user.getUserType().contains("3")) //档案
                 || (("4").equals(result) && user.getUserType().contains("4")) //后管
+                || (("5").equals(result)) // 成本管控系统
         ) {
             //放行
             return;

blade-common/src/main/java/org/springblade/common/constant/BusinessConstant.java

@@ -4,6 +4,8 @@ public interface BusinessConstant {
 
     String APPLICATION_WEATHER_NAME = "blade-business";
 
+    String APPLICATION_CONTROL_NAME = "blade-control";
+
     //redis树
     String CONTRACT_CACHE_WBSTREE = "contract:wbstree:";
 }

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -46,7 +46,7 @@ public interface LauncherConstant {
 	String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin";
 
 	/**
-	 * nacos dev 地址
+	 * nacos dev 地址 172.31.222.127
 	 */
 	String NACOS_DEV_ADDR = "127.0.0.1:8848";
 

blade-service-api/blade-control-api/pom.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-service-api</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.9.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>blade-control-api</artifactId>
+    <version>${bladex.project.version}</version>
+</project>

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/PlanInfo.java

@@ -0,0 +1,23 @@
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+@Data
+@TableName("c_control_plan_info")
+@EqualsAndHashCode(callSuper = true)
+public class PlanInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    private String planName;
+    private String planNumber;
+    private Integer planDept;
+    private Integer planType;
+    private Date planStartDate;
+    private Date planEndDate;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/feign/test.java

@@ -0,0 +1,4 @@
+package org.springblade.control.feign;
+
+public class test {
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/test.java

@@ -0,0 +1,4 @@
+package org.springblade.control.vo;
+
+public class test {
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTreeContract.java

@@ -83,23 +83,26 @@ public class ArchiveTreeContract extends BaseEntity {
 	*/
 	private String fullName;
 	/**
-	* 节点类型
+	* 节点类型，1　关联电子原生文件 2　数组化上传文件
 	*/
 	private Integer nodeType;
 	/**
-	* 岗位类型
+	* 岗位类型 见 blade_role表 ：业主，施工单位，监理单位
 	*/
 	private String postType;
 	/**
 	* 关联类型
+	 * 1 质检资料 2 试验资料 3 影像资料 4 台账资料 5 首件资料 6 日志文件
 	*/
 	private Integer associationType;
 	/**
 	* 内业资料类型
+	 * 1 开工报告 2 工序资料 3 质量评定 4 中间交工
 	*/
 	private String majorDataType;
 	/**
 	* 显示层级
+	 * １单位工程２分部工程 ３子分部工程　４分项工程５子分项工程 ６工序　
 	*/
 	private String displayHierarchy;
 	/**
@@ -116,6 +119,7 @@ public class ArchiveTreeContract extends BaseEntity {
 	private Integer isInterfaceNode;
 	/**
 	* 接口类型
+	 * 1 试验接口 2 计量接口
 	*/
 	private Integer interfaceType;
 	/**
@@ -128,18 +132,21 @@ public class ArchiveTreeContract extends BaseEntity {
 	private String remark;
 	/**
 	* 工程类型
+	 * 1 公路工程  2  水利水电工程 3  全部
 	*/
 	private Integer projectType;
-	/**
-	* 关联类型
+	/** 存储类型
+	* 1 普通 2竣工图 3 计量 4 质检 5 声像 6 试验 7 隐蔽 8 管理文件 9 变更令
+	 *  todo 档案和档案树节点下文件的类型，取决于这个
 	*/
 	private Integer storageType;
 	/**
 	* 扩展类型
+	 *  1 wbs 动态节点  2  施工单位和监理单位大节点下，XXX合同段，这种扩展节点
 	*/
 	private Integer extType;
 	/**
-	* 扩展Id，如动态工序节点的wbsid
+	* 扩展Id，如动态工序节点的wbs树的id
 	*/
 	private Long extId;
 
@@ -174,22 +181,27 @@ public class ArchiveTreeContract extends BaseEntity {
 	 */
 	private Long fromId;
 	/**
-	 * 扩展Id铆钉的树节点id
+	 * 扩展Id铆钉的树节点id，暂未使用
 	 */
 	private Long extAttachId;
 
 	/**
 	 * 试验资料类型
+	 * 1 配合比 2 原材 3 汇总 4 设备 5外委
 	 */
 	private String expDataType;
 
-	//权限编码
+	/*、
+	  施工树： tree_code  = “C“  +  tree_code=对应合同段ID节点  + 根节点
+      监理树   tree_code  = “S“  +  tree_code=对应合同段ID节点  + 根节点
+      建设单位树， tree_code = "" 的节点 （或者全部节点）
+	 */
 	private String treeCode;
 
 	//树形排序
 	private String treeSort;
 
-	//---节点基础信息，自动组卷需要这些参数来确定
+	//---节点基础信息，自动组卷需要这些参数来确定，为空的则从合同段对应的字段取
 	//档号前缀
 	private String fileNumberPrefix;
 	//保管期限

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2810,16 +2810,17 @@ public class InformationWriteQueryController extends BladeController {
 
         if (saveList.size() > 0) {
             StringBuilder str = new StringBuilder();
+            str.append("-"+saveList.get(0).getFullName());
             //保存施工日志
-            if (saveLedger.size() > 0) {
-                this.constructionLedgerService.saveBatch(saveLedger, 1000);
-                str.append("-[");
-                for (ConstructionLedger ledger : saveLedger) {
-                    str.append(ledger.getSite() + ",");
-                }
-                str.deleteCharAt(str.length() - 1);
-                str.append("]");
-            }
+//            if (saveLedger.size() > 0) {
+//                this.constructionLedgerService.saveBatch(saveLedger, 1000);
+//                str.append("-[");
+//                for (ConstructionLedger ledger : saveLedger) {
+//                    str.append(ledger.getSite() + ",");
+//                }
+//                str.deleteCharAt(str.length() - 1);
+//                str.append("]");
+//            }
 
             try {
                 //获取当前节点的所有父节点

blade-service/blade-control/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-service</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.9.1.RELEASE</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>blade-control</artifactId>
+    <name>${project.artifactId}</name>
+    <version>${bladex.project.version}</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-control-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

blade-service/blade-control/src/main/java/org/springblade/ControlApplication.java

@@ -0,0 +1,22 @@
+package org.springblade;
+
+import org.springblade.common.constant.BusinessConstant;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+
+/**
+ * 客户端启动类
+ */
+@EnableAsync
+@EnableBladeFeign
+@SpringCloudApplication
+public class ControlApplication {
+
+    public static void main(String[] args){
+        BladeApplication.run(BusinessConstant.APPLICATION_CONTROL_NAME, ControlApplication.class, args);
+    }
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/controller/PlanInfoController.java

@@ -0,0 +1,30 @@
+package org.springblade.control.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.control.entity.PlanInfo;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/plan")
+@Api(value = "计划接口", tags = "计划接口")
+public class PlanInfoController extends BladeController {
+
+    @PostMapping("/page")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "计划分页查询")
+    public IPage<PlanInfo> page(@RequestBody PlanInfo vo) {
+        return null;
+    }
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/PlanInfoMapper.java

@@ -0,0 +1,7 @@
+package org.springblade.control.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.control.entity.PlanInfo;
+
+public interface PlanInfoMapper extends BaseMapper<PlanInfo> {
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/PlanInfoMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.control.mapper.PlanInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="resultMap" type="org.springblade.control.entity.PlanInfo">
+        <result column="id" property="id"/>
+        <result column="plan_name" property="planName"/>
+        <result column="plan_number" property="planNumber"/>
+        <result column="plan_dept" property="planDept"/>
+        <result column="plan_type" property="planType"/>
+        <result column="plan_start_date" property="planStartDate"/>
+        <result column="plan_end_date" property="planEndDate"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/PlanInfoService.java

@@ -0,0 +1,10 @@
+package org.springblade.control.service;
+
+import org.springblade.control.entity.PlanInfo;
+import org.springblade.core.mp.base.BaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface PlanInfoService extends BaseService<PlanInfo> {
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PlanInfoServiceImpl.java

@@ -0,0 +1,14 @@
+package org.springblade.control.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.control.entity.PlanInfo;
+import org.springblade.control.mapper.PlanInfoMapper;
+import org.springblade.control.service.PlanInfoService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@AllArgsConstructor
+@Service
+public class PlanInfoServiceImpl extends BaseServiceImpl<PlanInfoMapper, PlanInfo> implements PlanInfoService {
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/wrapper/test.java

@@ -0,0 +1,4 @@
+package org.springblade.control.wrapper;
+
+public class test {
+}

blade-service/blade-control/src/main/resources/application-dev.yml

@@ -0,0 +1,13 @@
+#服务器端口
+server:
+  port: 8687
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+
+
+

blade-service/blade-control/src/main/resources/application-prod.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 8686
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.prod.url}
+    username: ${blade.datasource.prod.username}
+    password: ${blade.datasource.prod.password}

blade-service/blade-control/src/main/resources/application-test.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 8686
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}

blade-service/blade-control/target/classes/application-dev.yml

@@ -0,0 +1,13 @@
+#服务器端口
+server:
+  port: 8687
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+
+
+

blade-service/blade-control/target/classes/application-prod.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 8686
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.prod.url}
+    username: ${blade.datasource.prod.username}
+    password: ${blade.datasource.prod.password}

blade-service/blade-control/target/classes/application-test.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 8686
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}