Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1870,7 +1870,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             model.setTitle("报废到期提醒");
 
             String equipName = map.get("name").toString();
-            String location = map.get("position").toString() + map.get("area").toString();
+            String location = map.getOrDefault("position", "").toString() + map.getOrDefault("area", "").toString();
 
             String body = String.format("%s-%s于%s报废，请提前更换处理", equipName, location, scrapTime);
             String join = i != 0 ? String.format("设备还剩%s天报废，请提前更换", i) : "设备今日到期，请立即更换";

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -426,7 +426,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     } else {
                         jsonObjectData.put("value", value);
                     }
-                    jsonObjectData.put("measurementType",equipmentSpecificIndex.getEquipmentIndexKey());
+                    jsonObjectData.put("measurementType", null == equipmentSpecificIndex.getEquipmentIndexKey() ? "" :equipmentSpecificIndex.getEquipmentIndexKey());
                     jsonObjectData.put("dateTime",date);
                     jsonObjectData.put("quality","0"); // 量测质量码：0 有效，1 无效
                     List<JSONObject> jsonObjects = Arrays.asList(jsonObjectData);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -801,6 +801,11 @@ public class ExcelServiceImpl {
 						formItemDescr.setFieldValue(null);
 						DynamicFormInitDto.setFormItemDescr(formItemDescr);
 					}
+					if ("gender".equals(DynamicFormInitDto.getKey())){
+						DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr();
+						formItemDescr.setFieldValue(null);
+						DynamicFormInitDto.setFormItemDescr(formItemDescr);
+					}
 					dynamicFormValue.add(DynamicFormInitDto.getFormItemDescr());
 				});
 				dynamicFormValue.forEach(dynamicFormInstanceDto -> {
@@ -837,13 +842,13 @@ public class ExcelServiceImpl {
 					if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
 						dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
 					}
-					if ("gender".equals(dynamicFormInstance.getFieldCode())){
+					if ("gender".equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
 						dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
 					}
-					if ("positionType".equals(dynamicFormInstance.getFieldCode())){
+					if ("positionType".equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
 						dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
 					}
-					if ("certificatesTypeCode".equals(fieldCode)){
+					if ("certificatesTypeCode".equals(fieldCode) && !ObjectUtils.isEmpty(map1.get(fieldCode))){
 						String[] split = map1.get(fieldCode).toString().split("@");
 						dynamicFormInstance.setFieldValue(split[1]);
 						dynamicFormInstance.setFieldValueLabel(split[0]);}
@@ -863,15 +868,16 @@ public class ExcelServiceImpl {
 				orgUsrExcelDto.setDynamicFormValue(dynamicFormInstancelist);
 				Bean.toPo(getCurrentInfo(), orgUsrExcelDto);
 				// 保存动态表单和人员单位表
-
-				String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@");
-				if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber())&&split55[1].equals("120")) {
-					if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
-						throw new RuntimeException("身份证号码重复!");
-					} else {
-						boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber(), null);
-						if (b) {
+				if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesTypeCode())){
+					String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@");
+					if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber())&&split55[1].equals("120")) {
+						if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
 							throw new RuntimeException("身份证号码重复!");
+						} else {
+							boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber(), null);
+							if (b) {
+								throw new RuntimeException("身份证号码重复!");
+							}
 						}
 					}
 				}

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -40,6 +40,7 @@
 	        wesi.equipment_specific_id AS equipmentSpecificId,
 	        wesi.equipment_index_id AS equipmentIndexId,
 	        wesi.equipment_index_name AS equipmentIndexName,
+	        wesi.equipment_index_key AS equipmentIndexKey,
 	        wesi.value_label AS valueLabel,
 	        wei.type_code AS typeCode,
 	        wei.type_name AS typeName,

amos-boot-system-tdc/amos-boot-module-tdc-api/pom.xml

@@ -10,42 +10,7 @@
   <artifactId>amos-boot-module-tdc-api</artifactId>
 
   <dependencies>
-      <dependency>
-          <groupId>org.springframework.data</groupId>
-          <artifactId>spring-data-elasticsearch</artifactId>
-          <scope>compile</scope>
-      </dependency>
-<!--      <dependency>-->
-<!--          <groupId>com.amosframework.boot</groupId>-->
-<!--          <artifactId>amos-boot-module-common-api</artifactId>-->
-<!--          <version>${amos-biz-boot.version}</version>-->
-<!--      </dependency>-->
-      <dependency>
-			<groupId>com.yeejoin</groupId>
-			<artifactId>amos-component-rule</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.typroject</groupId>
-					<artifactId>tyboot-core-auth</artifactId>
-				</exclusion>
-			</exclusions>
-      </dependency>
 
-<!--      <dependency>-->
-<!--          <groupId>com.aspose</groupId>-->
-<!--          <artifactId>aspose-words</artifactId>-->
-<!--          <version>15.8.0</version>-->
-<!--      </dependency>-->
 
-      <dependency>
-          <groupId>com.aspose</groupId>
-          <artifactId>aspose-words</artifactId>
-          <version>15.8.0</version>
-          <classifier>jdk16</classifier>
-      </dependency>
   </dependencies>
-
-
-
-
 </project>

amos-boot-system-tdc/amos-boot-module-tdc-biz/pom.xml

@@ -15,11 +15,6 @@
 		<artifactId>amos-boot-module-tdc-api</artifactId>
 		<version>${amos-biz-boot.version}</version>
       </dependency>
-<!--      <dependency>-->
-<!--          <groupId>com.amosframework.boot</groupId>-->
-<!--          <artifactId>amos-boot-module-common-biz</artifactId>-->
-<!--          <version>${amos-biz-boot.version}</version>-->
-<!--      </dependency>-->
       <dependency>
           <groupId>org.apache.httpcomponents</groupId>
           <artifactId>httpmime</artifactId>
@@ -28,6 +23,11 @@
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
         </dependency>
+      <dependency>
+          <groupId>com.yeejoin</groupId>
+          <artifactId>amos-component-security</artifactId>
+          <version>1.8.1</version>
+      </dependency>
   </dependencies>
     <build>
         <plugins>

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/action/model/IdxProjectModel.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.tdc.biz.action.model;
 
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-import liquibase.pro.packaged.L;
 import lombok.Data;
 
 import java.io.Serializable;

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/config/WebSecurityConfig.java

-package com.yeejoin.amos.boot.module.tdc.biz.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-    // 授权
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()
-                .headers()
-                .frameOptions()
-                .disable()
-                .and()
-                .authorizeRequests()
-                .regexMatchers("^(?!/actuator).*$").permitAll()
-                .regexMatchers("/actuator/health").permitAll()
-                .regexMatchers("/actuator/info").permitAll()
-                .anyRequest().authenticated().and()
-                .formLogin();
-    }
-}

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckResultImpl.java

@@ -31,7 +31,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
-import liquibase.pro.packaged.M;
 import org.codehaus.jettison.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/resources/application-dev.properties

@@ -7,7 +7,10 @@ spring.datasource.password=Yeejoin@2020
 #eureka.client.fetchRegistry=false
 #eureka.client.server.waitTimeInMsWhenSyncEmpty=0
 eureka.instance.hostname=172.16.10.215
-eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
+#eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
+
+eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.215:10001/eureka/
+
 ## redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.215
@@ -24,4 +27,6 @@ emqx.password=public
 #mqtt.scene.host=mqtt://172.16.10.201:18083/mqtt
 #mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
-#spring.mqtt.completionTimeout=3000
+#spring.mqtt.completionTimeout=3000
\ No newline at end of file
+
+tdc.file.examine.work.flow.processDefinitionKey=tdc_file_examine
\ No newline at end of file

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/resources/application.properties

@@ -43,6 +43,20 @@ spring.redis.lettuce.pool.min-idle=0
 spring.security.user.name=admin
 spring.security.user.password=a1234560
 
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username= admin
+knife4j.basic.password= a1234560
+
+spring.boot.admin.client.enabled=true
+spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
+spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
+spring.boot.admin.client.username=admin
+spring.boot.admin.client.password=a1234560
+management.security.enabled=false
+management.health.redis.enabled=false
+
+
 ## redis失效时间
 redis.cache.failure.time=10800
 

amos-boot-system-tdc/pom.xml

@@ -32,10 +32,24 @@
     <dependency>
       <groupId>com.yeejoin</groupId>
       <artifactId>amos-feign-privilege</artifactId>
-      <version>1.7.12-SNAPSHOT</version>
+      <version>1.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.yeejoin</groupId>
+      <artifactId>amos-component-rule</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.typroject</groupId>
+          <artifactId>tyboot-core-auth</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.aspose</groupId>
+      <artifactId>aspose-words</artifactId>
+      <version>15.8.0</version>
+      <classifier>jdk16</classifier>
     </dependency>
-
-
   </dependencies>
 </project>