Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -12,13 +12,16 @@ public interface StatisticsHomepageMapper {
   @UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
   public   List<Map<String,Object>> surveyStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode,  @RequestParam(value = "province")String province, @RequestParam(value = "city") String city,  @RequestParam(value = "district")String district);
 
+  @UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
+  public   int selectWKC(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode,  @RequestParam(value = "province")String province, @RequestParam(value = "city") String city,  @RequestParam(value = "district")String district);
+
   @UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
   public   List<Map<String,Object>> homePageExport(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode,  @RequestParam(value = "province")String province, @RequestParam(value = "city") String city,  @RequestParam(value = "district")String district);
 
   @UserEmpower(field ={"b.regionalCompaniesCode"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
   public   List<Map<String,Object>> merCount(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode,  @RequestParam(value = "province")String province, @RequestParam(value = "city") String city,  @RequestParam(value = "district")String district);
 
-  @UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
+  @UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
   public  List<Map<String,Object>> contractStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode,  @RequestParam(value = "province")String province, @RequestParam(value = "city") String city,  @RequestParam(value = "district")String district);
   @UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
   public  List<Map<String,Object>> desionTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode,  @RequestParam(value = "province")String province, @RequestParam(value = "city") String city,  @RequestParam(value = "district")String district);

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

@@ -7,24 +7,7 @@
         SUM(CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END)AS '未通过',
         SUM(CASE WHEN ps.process_status = '进行中' AND ps.business_status = '通过' AND next_node_name = '设计上传典型图库' THEN 1 ELSE 0 END)  AS '已完成(法务审核)',
         SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END)  AS completeTotal,
-        SUM(CASE WHEN ps.process_status = '进行中' AND (ps.business_status IS NULL OR ps.design_status IS NULL OR ps.technology_status IS NULL  or  ps.business_status = '' OR ps.design_status = '' OR ps.technology_status = '') THEN 1 ELSE 0 END)  AS '进行中(审核)',
-        (		SELECT count(*)  FROM hygf_peasant_household WHERE construction_state = '待勘察' and is_delete = 0
-        <if test="developerCode != null and developerCode != ''">
-            AND hygf_peasant_household.developer_code = #{developerCode}
-        </if>
-        <if test="regionalCompaniesCode != null and regionalCompaniesCode != ''">
-            AND hygf_peasant_household.regional_companies_code = #{regionalCompaniesCode}
-        </if>
-        <if test="province != null and province != ''">
-            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{province},'%')
-        </if>
-        <if test="city != null and city != ''">
-            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{city},'%')
-        </if>
-        <if test="district != null and district != ''">
-            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
-        </if>
-        ) AS '未勘察'
+        SUM(CASE WHEN ps.process_status = '进行中' AND (ps.business_status IS NULL OR ps.design_status IS NULL OR ps.technology_status IS NULL  or  ps.business_status = '' OR ps.design_status = '' OR ps.technology_status = '') THEN 1 ELSE 0 END)  AS '进行中(审核)'
         FROM
             hygf_power_station ps
                 LEFT JOIN
@@ -49,33 +32,53 @@
 
     </select>
 
+    <select id="selectWKC" resultType="int">
+     		SELECT count(*)  FROM hygf_peasant_household WHERE construction_state = '待勘察' and is_delete = 0
+        <if test="developerCode != null and developerCode != ''">
+            AND hygf_peasant_household.developer_code = #{developerCode}
+        </if>
+        <if test="regionalCompaniesCode != null and regionalCompaniesCode != ''">
+            AND hygf_peasant_household.regional_companies_code = #{regionalCompaniesCode}
+        </if>
+        <if test="province != null and province != ''">
+            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{province},'%')
+        </if>
+        <if test="city != null and city != ''">
+            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{city},'%')
+        </if>
+        <if test="district != null and district != ''">
+            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
+        </if>
+
+    </select>
+
     <select id="contractStatusTotal" resultType="map">
         SELECT
-
-        SUM(CASE WHEN status  = '未签署' and  initiate_status = '未发起' THEN 1 ELSE 0 END)  AS '未发起',
+        SUM(CASE WHEN status  = '未签署' THEN 1 ELSE 0 END)  AS '未签署',
         SUM(CASE WHEN status  = '双方已签署' THEN 1 ELSE 0 END)  AS '双方已签署',
         SUM(CASE WHEN status  = '农户已签署' THEN 1 ELSE 0 END)  AS '农户已签署',
         SUM(CASE WHEN status  = '已作废' THEN 1 ELSE 0 END)  AS '已作废'
         FROM
-        hygf_household_contract
-        LEFT JOIN
-        hygf_peasant_household ON hygf_household_contract.peasant_household_id = hygf_peasant_household.sequence_nbr   WHERE
-        status != '已作废'
+        ( SELECT hhc.*, ROW_NUMBER() OVER ( PARTITION BY peasant_household_id ORDER BY sequence_nbr DESC ) AS rn FROM hygf_household_contract hhc ) subq
+        LEFT JOIN hygf_peasant_household ph ON ph.SEQUENCE_NBR = subq.peasant_household_id
+        WHERE
+        subq.rn = 1
         <if test="developerCode != null and developerCode != ''">
-            AND hygf_peasant_household.developer_code = #{developerCode}
+            AND ph.developer_code = #{developerCode}
         </if>
         <if test="regionalCompaniesCode != null and regionalCompaniesCode != ''">
-            AND hygf_peasant_household.regional_companies_code = #{regionalCompaniesCode}
+            AND ph.regional_companies_code = #{regionalCompaniesCode}
         </if>
         <if test="province != null and province != ''">
-            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{province},'%')
+            AND ph.project_address LIKE CONCAT ('%',#{province},'%')
         </if>
         <if test="city != null and city != ''">
-            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{city},'%')
+            AND ph.project_address LIKE CONCAT ('%',#{city},'%')
         </if>
         <if test="district != null and district != ''">
-            AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
+            AND ph.project_address LIKE CONCAT ('%',#{district},'%')
         </if>
+
     </select>
 
     <select id="desionTotal" resultType="map">

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

@@ -19,13 +19,18 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHYGFMaintenanceTicketsService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -40,7 +45,8 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
     EmqKeeper emqKeeper;
     @Autowired
     TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
-
+    @Value("${hygf.sms.tempCode}")
+    private String smsTempCode;
     @Autowired
     HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
     @Autowired
@@ -81,6 +87,23 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
 
     public void sendMeassageToMcb(HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
 
+        MaintenanceDto data = maintenanceMapper.selectOneById(Long.valueOf(hygfMaintenanceTicketsDto.getMaintenancePersonId()));
+
+        if (ObjectUtil.isNotEmpty(data)) {
+
+            HashMap<String, String> params = new HashMap<>(3);
+
+            params.put("code","123456");
+            params.put("mobile",data.getTelephone());
+            params.put("smsCode", smsTempCode);
+            try {
+                Systemctl.smsClient.sendCommonSms(params).getResult();
+            } catch (Exception e) {
+
+                throw new BadRequest("发送短信失败：" + e.getMessage());
+            }
+        }
+
         if(hygfMaintenanceTicketsDto.getWarningId()==null){
 
 
@@ -117,6 +140,18 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
             if (ObjectUtil.isNotEmpty(maintenance)) {
                 hygfMaintenanceTicketsDto.setMaintenancePersonName(maintenance.getName());
                 hygfMaintenanceTicketsDto.setMaintenancePersonPhone(maintenance.getTelephone());
+
+                HashMap<String, String> params = new HashMap<>(3);
+
+                params.put("code","123456");
+                params.put("mobile",maintenance.getTelephone());
+                params.put("smsCode", smsTempCode);
+                try {
+                    Systemctl.smsClient.sendCommonSms(params).getResult();
+                } catch (Exception e) {
+
+                    throw new BadRequest("发送短信失败：" + e.getMessage());
+                }
             }
             HYGFMaintenanceTickets fMaintenanceTickets=new HYGFMaintenanceTickets();
             BeanUtils.copyProperties(hygfMaintenanceTicketsDto,fMaintenanceTickets);

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

@@ -47,6 +47,9 @@ public class StatisticsHomepageServiceImpl {
         Map<String, Object> resultMap = MapBuilder.<String, Object>create().build();
         Map<String, Object> map = MapBuilder.<String, Object>create().build();
         List<Map<String, Object>> surveyMaps = statisticsHomepageMapper.surveyStatusTotal(developerCode, regionalCompaniesCode, province, city, district);
+       if (!CollectionUtil.isEmpty(surveyMaps)){
+           surveyMaps.get(0).put("未勘察",statisticsHomepageMapper.selectWKC(developerCode, regionalCompaniesCode, province, city, district));
+       }
         this.resuleMapBuild(map,resultMap,surveyMaps,"surey");
         List<Map<String, Object>> desionMaps = statisticsHomepageMapper.desionTotal(developerCode, regionalCompaniesCode, province, city, district);
         this.resuleMapBuild(map,resultMap,desionMaps,"desion");

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

@@ -93,7 +93,7 @@ emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
-emqx.password=Yeejoin@1234
+emqx.password=Yeejoin@2020
 emqx.max-inflight=1000