Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

@@ -36,6 +36,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
     List<Map<String,Object>> selectUserIsHouse(String telephone);
 
     Integer selectIsAllRevoke(String peasantHouseholdNo);
+    Integer selectIsAllRevokePassCount(String peasantHouseholdNo);
 
     void deleteHphByUserId(String userId);
     void deletePauByUserId(String userId);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml

@@ -18,16 +18,21 @@
             ph.is_delete = 0
             <if test="param != null">
                 <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
-                    AND icbc.protocol_status = #{param.openAccountStatus}
+                    <if test="param.openAccountStatus != '00'">
+                        AND icbc.open_account_status = #{param.openAccountStatus}
+                    </if>
+                    <if test="param.openAccountStatus == '00'">
+                        AND (icbc.open_account_status = #{param.openAccountStatus} OR icbc.open_account_status is null)
+                    </if>
                 </if>
                 <if test="param.custName != null and param.custName != ''">
-                    AND ph.owners_name LIKE CONCAT('%', #{param.custName}, '%')
+                    AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR icbc.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
                 </if>
                 <if test="param.idCard != null and param.idCard != ''">
-                    AND ph.id_card LIKE CONCAT('%', #{param.idCard}, '%')
+                    AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
                 </if>
                 <if test="param.phone != null and param.phone != ''">
-                    AND ph.telephone LIKE CONCAT('%', #{param.phone}, '%')
+                    AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
                 </if>
                 <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
                     AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
@@ -54,16 +59,21 @@
             ph.is_delete = 0
             <if test="param != null">
                 <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
-                    AND icbc.protocol_status = #{param.openAccountStatus}
+                    <if test="param.openAccountStatus != '00'">
+                        AND icbc.open_account_status = #{param.openAccountStatus}
+                    </if>
+                    <if test="param.openAccountStatus == '00'">
+                        AND (icbc.open_account_status = #{param.openAccountStatus} OR icbc.open_account_status is null)
+                    </if>
                 </if>
                 <if test="param.custName != null and param.custName != ''">
-                    AND ph.owners_name LIKE CONCAT('%', #{param.custName}, '%')
+                    AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR icbc.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
                 </if>
                 <if test="param.idCard != null and param.idCard != ''">
-                    AND ph.id_card LIKE CONCAT('%', #{param.idCard}, '%')
+                    AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
                 </if>
                 <if test="param.phone != null and param.phone != ''">
-                    AND ph.telephone LIKE CONCAT('%', #{param.phone}, '%')
+                    AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
                 </if>
                 <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
                     AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -93,14 +93,18 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
 
 
     <select id="selectIsAllRevoke" resultType="Integer">
-        SELECT
-            count(*) = ( SELECT count(*) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废' )
-        FROM
-            hygf_household_contract
-        WHERE
-            peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'
+<!--        SELECT-->
+<!--            count(*) = ( SELECT count(*) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废' )-->
+<!--        FROM-->
+<!--            hygf_household_contract-->
+<!--        WHERE-->
+<!--            peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'-->
+        SELECT count(1) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起' AND STATUS = '已作废'
     </select>
 
+    <select id="selectIsAllRevokePassCount" resultType="java.lang.Integer">
+        SELECT count(1) FROM hygf_household_contract WHERE peasant_household_number = #{peasantHouseholdNo} and initiate_status = '已发起'
+    </select>
     <select id="deleteHphByUserId">
         DELETE FROM hygf_peasant_household WHERE amos_user_id=#{userId}
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -72,11 +72,11 @@
             and hygf_work_order.sequence_nbr = #{dto.workOrderId}
         </if>
         <if test=' dto.type!=null and dto.type == "1"'>
-            and  hygf_work_order_power_station.power_station_construction_status in ("待登记","未通过","已完工","待审核")
+            and  hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工','待审核')
         </if>
 
         <if test=' dto.type !=null and dto.type == "2"'>
-            and  hygf_work_order_power_station.power_station_construction_status in ("未通过","已完工","待审核")
+            and  hygf_work_order_power_station.power_station_construction_status in ('未通过','已完工','待审核')
         </if>
 
         <if test="dto.projectAddressName!=null and dto.projectAddressName!=''">

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/config/MysqlServerConfig.java

@@ -178,7 +178,6 @@ public class MysqlServerConfig {
 
 
         bean.setPlugins(new Interceptor[] {interceptor,
-                paginationInterceptor(),
                 userEmpowerInterceptor(),
                 paginationInterceptor()
         });

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -239,7 +240,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         List<PeasantHousehold> newRecords = records.stream().map(item -> {
 //            查询该条数据能否被删除, 0不能删除, 1可以删除
-            item.setIsAllRevoke(peasantHouseholdMapper.selectIsAllRevoke(item.getPeasantHouseholdNo()));
+            item.setIsAllRevoke(BooleanUtil.toInteger(peasantHouseholdMapper.selectIsAllRevokePassCount(item.getPeasantHouseholdNo()) == peasantHouseholdMapper.selectIsAllRevoke(item.getPeasantHouseholdNo())));
 
 
             if(item.getSurveyOrNot() != null){
@@ -805,9 +806,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             }
 
             // 查询该条数据能否被删除, 0不能删除, 1可以删除
-            Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo);
-
-            if(isAllRevok != 1) {
+//            Integer isAllRevok = peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo);
+        Integer isAllRevok = BooleanUtil.toInteger(peasantHouseholdMapper.selectIsAllRevokePassCount(peasantHouseholdNo) == peasantHouseholdMapper.selectIsAllRevoke(peasantHouseholdNo));
+        if(isAllRevok != 1) {
                 throw new BadRequest("该用户有未完成的任务, 无法删除！");
             }
 

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

@@ -247,5 +247,25 @@ spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=123456
 spring.elasticsearch.rest.read-timeout=30000
 
-## 聚富通 配置
-hygf.icbc.callbackUrl=https://yth.yunqingtech.com/hygf/icbc/notify
+## 聚富通工行 测试环境配置
+hygf.icbc.callbackUrl=https://yth.yunqingtech.com/hygf/icbc/notify
\ No newline at end of file
+hygf.icbc.appId=11000000000000009254
+hygf.icbc.corpNo=10000000000000088011
+hygf.icbc.myPrivateKey=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCxMt/01YNUsTfG6ml8Nyw7Xs80k3G72mmnD8mpR5v6ZU0v7i8lynBJxqDWFRqo6brZr/yzneyuEM0c+qbhYA4NNgWuri87PFWZND5H249ZpEZPmnZSOg6R7RwiFQG8uhwMTlZwYkNJc6fBFnLvUwMu3pPHINx10iHh7dawbX1GZDKk82gUBaTzYMkg0CW8PtOUdGwW+4uyt5KGWp90MTqS47JmGCLWWwLMW3MhPe8/PBApFdRQi2cdOXHQ+HwleTL7kHXi2XEHnbIxZuOuyXUkiRog4fajs+ZS+o+YgC2JEhGN5om64LrSUXrEyeOZSdHMriKLxsBUbS5AUP8rOvqjAgMBAAECggEBAKwB55YhoK+Yq70ilSzn3b7wBJFTwyaIGOD7mVUCVy3UIf4x5oB3p1JmRoAp0kw/PorLo7CzzykU1BaaVV4XQOygERoEqYKFyc3DAeX9AoUQytPA67Rb+QK8OP/4hkwuGMX1UUEckZZ+d0wev4kDeuaHVsoIYxjX1t4aYrm2PtIRGFLYZvB44Chu8oCK/yesZ9JP+BKKPLJzsx1bEnxZHkQK4IJBWbxSbi/QGiJ254Q4nyinCPUuaRzpiiN/ZmbdLIZ4NYZeQr7sK4wXhgy6XMeMZFHm/WE0EKSBqR82oO6PL/AOR6v9GVMj9kGLfegQHsFyiDJKHzYqj80hX5tyZIkCgYEA6PdmNOpiplNBkg9xxGgSZIWqbRqKBTR51QDB2WPKkC27S7Biy1E+ncz7osSP9X16Y87eKV32ioqJzZ9eND1ri9DnETkPhnYfv4DJRsD3fTHZCtPh274KXASma4DyZnCJY913vjHKqAjJKwl10SR7EFGwQ1LOHKXkLrUa4rASvH0CgYEAwrfxXj+94YnFkialYNbVT3pYdYR0x6b9z70YnYktaZtWZO01hV8lpdpKi/6f5DMIrDC6d9QsjmVXEjZFv1YLlkqEc8FXsThsXWphCr27EtEwymlN90RiIjBInhUh4BrQqMRKbz8CAQgyxiNohEJUVwVlESNSBjfi0eNHFwRg3Z8CgYBE/X73DLJKLz2r04cNcwR/YFYoGUPmZrPtsFu31SWXrPNaZtHbBCRW9u1ONoerW41zIUAJYBoyzPQiQJ/VOJswvJyxLQS7/R9JxwnUOjEQkkKEQlsQiCbpOTdPftBKJemJ+XwMhxJM0M1CQXryhKstGgPo7Ay9zyLT8i4UE7B4wQKBgQCKiNo2Jv2OUDn7sHkq+84J3M7A1XtMbLfZq/yuYGGp6DXAWrAgcsBTToqJLaBOeCysbYLNLGyC5wDa2TgoWCyoQd4YiS89zBn1IHFodfJ6AdFHwUISMVnsXxPbPMe8LPfViso2ecqQN2gAZkK/Dn3458KvPcTm3a4HjD8Q1jGgmwKBgHbzvyt1R38BEGeDhJhqOaBuTeqgChPyQrd1dFRE2VicrTksldel3eHbLgq1iYRyw+l9M66a/03XiCa3yLMIGOn/hOQE7dGxmBI2x44Tf5LugBuQnc5WSXwJ3Qa4+Yjw5yMBL/Hw8hRFlt5ycpy2YyAZ/jdnoNiOuM5koFpQFvfs
+hygf.icbc.serviceUrl=https://apipcs3.dccnet.com.cn
+hygf.icbc.aesKey=5xGJdh7qb+B95SUoxDlatg==
+hygf.icbc.camsPublicKey=040978047533e0e7381dbb5d794b268cd68ad4655712d3de5bb37d6883c02e474374ff4dac6d706cef661aaa788c1dfc2c2f74b91d05f406ea135b865b416c8f97
+hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03ctKM7KV+16bWZ5BMNgvEeuEQwfQYkRVwI9HFOGkwNTMn5hiJXHnlXYCX+zp5r6R52MY0O7BsTCLT7aHaxsANsvI9ABGx3OaTVlPB59M6GPbJh0uXvio0m1r/lTW3Z60RU6Q3oid/rNhP3CiNgg0W6O3AGqwIDAQAB
+hygf.icbc.outVendorId=071301
+hygf.icbc.projectId=PJ14001401B000160171
+
+## 聚富通工行 生产环境配置
+#hygf.icbc.appId=11000000000000028870
+#hygf.icbc.corpNo=020240710000001169
+#hygf.icbc.myPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAlcIeANdqipul3/qAIRlknSacHiFCMzLzUJisGcr9ipm3p2rir8WDsac2MxgtUt+f89SGNoWyjv4q0/QAKQQTd5U3KuGAksCJLBGVibuFe7G7YGYVezUksjvocvp8GIinCIkzq67KL2SOpGXAu3s+282rx8AxdTZA/EhXQvbORbWz5+DamyY+wS7Maa8KmIOb6WZPtiXgENZxDHAafrqW8Gt1BnVfJNf5yS5J9Wl+LcR1EPvi5iH8dSIdn1ZMVupoREjV/DvItSogVehsqTRZWuekAo2xH9YEli1UMG/l3deViRn/A4VmPPzdv0xXpn/yO+OTjWez+KmSmJfAZXBvAgMBAAECggEABRYviWFWTz8X+1qeIDI/nHO2KFt3X2tAxkJztd/8h5PYmYw3e4NPATp5Ayp4UgIlW/ExxNW91EiImBL/F939eJIpA8sDJ8U4hqb+U+fOZyksOZnDOIAHmE+I24vl588yFM9Z6F55gGeeDVJ0SZHqIG/nz8i339aLt02yj3N6V1peQugBP6L9arcD+gVu4F70whkqW+lHBK/WzX1OazqEx3Ip175jqzi9/0vO/h/kqnGGXuMi2VeuAPsa+d0a6lf/FScxqCt3t6dCkJ5DPA1MCj81dPi5ZfCM/vE0N8I6LEV+RyC7bb4YVO/PoicFjb2j8vfLvldOUrsvkNH51dZusQKBgQDpMHacOBpIuVzEFfNtS9SgA96cUV6NCSmHoQppJ/p9xKzY4DpcqoOCIBT4WCvVe6PeN5mrjzt8Q5gJWxiq0tVgIF9k8GjLmuiJ2v4Qh8aUmlRwn0T0DYiX/Y7uzX+pRlkpoKrSktlTOT9vmGwZDGDk0h2+H3hZ3YQEucfA6bhHmQKBgQDTbHrbr1WsUR9lrdLaGi/Uphpl3BXLuCnJXav3yIZOktO5V68MfPZXLP7aaNtbK3n0YHD+Uv8wpHBBSWQYjVYlGdvlniA/W1pr73GZJECFfS1BmmFC4GG3E92D5IkmrcPlUuz8XxKrlwHnfW1F0MoDvhp930vS0tS6u+WYTt9dRwKBgCeEQPVkRIACeYf5OFFTQmsDfNv8pgs8fD8xuTPsxHQ/uhLenMVLWBHbIfKb7oG0/CYSQgZitW/vfHpJZ7q7E9HAaqoOW5P1YmbKJ7fhanOQW7LiKqs5B+bJ30j0piendkCpq4kXvaBu2SMuL1NnV5wvRz8K0jhYY6DxYrp8YPAxAoGAZxWTaZ25tgTvvBHeprzx6Ur7wAJpFiU7KpVjjbLV2WW5mbro/LvJGIQ11qQdn/w4wDBtp3MsPblPimWQSnBPOlO7Zd+NdZbDJbFfv/1vACcic8Qj/AmPW0ZyUSaSwKskwqGGLx7j6Yn9QbNkHhBJDz4XiJvhSm/FjS6kKXj7a20CgYEArnEiPmL5g1Ca/qKK9ql8Q6P9gipIfGGpaFu23y0trbcFpVn8Oos/ic0Jgw4Xiz+rqvb6bW2V6lqBJ+9/kdn0i7zlZxKNpYsW2xFgi04OU3d5HkGL16Y1rpqMYYEhjFaOIn7J8P046UYR99yaybgQd18TE6oFrX8OL5uY8M4ge4Y=
+#hygf.icbc.serviceUrl=https://gw.open.icbc.com.cn
+#hygf.icbc.aesKey=nuCVNzIxOTHZWv8YjEeYQA==
+#hygf.icbc.camsPublicKey=655CE8706E6ED9A30B92E57D8D645ADDE8C541C27C5C5AFD529C610C4C0B04F9074E3B6E933C50A3316AEA60CEF461BE4C7916D2AF51170D3A2631394A7F3939
+#hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMpjaWjngB4E3ATh+G1DVAmQnIpiPEFAEDqRfNGAVvvH35yDetqewKi0l7OEceTMN1C6NPym3zStvSoQayjYV+eIcZERkx31KhtFu9clZKgRTyPjdKMIth/wBtPKjL/5+PYalLdomM4ONthrPgnkN4x4R0+D4+EBpXo8gNiAFsNwIDAQAB
+#hygf.icbc.outVendorId=071301
+#hygf.icbc.projectId=PJ14001401B000160171
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -1893,8 +1893,8 @@ public class CommonServiceImpl {
         Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
                 .collect(Collectors.toMap(
                         indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
-                        IndicatorData::getValueF));
-        // 将测点id与值处理成map
+                        IndicatorData::getValueF,
+                        (value1, value2) -> value1));     // 将测点id与值处理成map
         HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
         log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap));
         log.info("data" + JSONObject.toJSONString(data));
@@ -2190,7 +2190,8 @@ public class CommonServiceImpl {
         Map<String, Float> indicatorDataListAllMap = indicatorDataListAll.stream()
                 .collect(Collectors.toMap(
                         indicatorData -> indicatorData.getAddress() + "_" + indicatorData.getGatewayId(),
-                        IndicatorData::getValueF));
+                        IndicatorData::getValueF,
+                        (value1, value2) -> value1));
         // 将测点id与值处理成map
         HashMap<String, Double> idxBizFanPointProcessVariableClassificationDtoIdValueMap = new HashMap<>();
         log.info("indicatorDataListAllMap" + JSONObject.toJSONString(indicatorDataListAllMap));

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -108,8 +108,8 @@
     <select id="queryWarningList" resultType="java.util.Map">
         SELECT
         log.SEQUENCE_NBR,
-        log.CREATE_DATE AS CREATE_DATE,
-        log.REC_DATE AS REC_DATE,
+        DATE_FORMAT(log.CREATE_DATE, '%Y-%m-%d %H:%i:%s') AS CREATE_DATE,
+        DATE_FORMAT(log.REC_DATE, '%Y-%m-%d %H:%i:%s') AS REC_DATE,
         log.EVENT_LEVEL_DESC,
         log.EVENT_LEVEL,
         log.SOURCE_ATTRIBUTION_DESC,