资源下载

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/CommonEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public enum CommonEnum {
+
+    居民("居民","jm","业主类型"),
+    非居民("非居民","fjm","业主类型"),
+    自建资产("自建资产","zx","电站类型"),
+    经销商代建("经销商代建","fzx","电站类型"),
+    平顶屋("平顶屋","pdw","屋顶类型"),
+    斜顶屋("斜顶屋","xdw","屋顶类型"),
+    庭院("ty","other","屋顶类型"),
+    别墅("别墅","bs","房屋整体情况"),
+    普通民房("普通民房","pymf","房屋整体情况"),
+    单门独院("单门独院","dmdy","房屋整体情况"),
+    一栋多户("一栋多户","yddh","房屋整体情况"),
+    一户一表("一户一表","yhyb","电表位置"),
+    集中电表("集中电表","jzdb","电表位置"),
+    南偏东("南偏东","npd","房屋偏向"),
+    南偏西("南偏西","npx","房屋偏向"),
+    正南("正南","zn","房屋偏向"),
+    移除遮挡物("移除遮挡物","yczdw","解决措施"),
+    设计规避("设计规避","sjgb","解决措施"),
+    公共共有("公共共有","gy","房屋产权情况"),
+    按份共有("按份共有","br","房屋产权情况"),
+    单独所有("单独所有","dy","房屋产权情况"),
+    高树("高树","gs","周边障碍物"),
+    建筑物("建筑物","jzw","周边障碍物"),
+    电线杆("电线杆","dxg","周边障碍物"),
+    带电线路("带电线路","ddxl","周边障碍物"),
+    变压器("变压器","byq","周边障碍物"),
+    阳台("阳台","yt","上至屋顶通道"),
+    孔洞("孔洞","kd","上至屋顶通道"),
+    楼梯间("楼梯间","ltj","上至屋顶通道"),
+    女儿墙("女儿墙","nrq","屋面遮挡物"),
+    热水器("热水器","rsq","屋面遮挡物"),
+    烟囱("烟囱","yc","屋面遮挡物"),
+    老虎窗("老虎窗","lhc","屋面遮挡物"),
+    水箱("水箱","sx","屋面遮挡物"),
+    无("无","wu","屋面遮挡物"),
+    无需防滑雪措施("无需防滑雪措施","wxfhxcs","防滑雪措施"),
+    预留防滑雪缓冲通道("预留防滑雪缓冲通道","ylfhxhctd","防滑雪措施"),
+    安装挡雪夹具("安装挡雪夹具","azdxjj","防滑雪措施"),
+    自然人("自然人","zrr","商务类型"),
+    非自然人("非自然人","fzrr","商务类型"),
+    宅基地农户屋顶("宅基地农户屋顶","zjdnhw","法务类型"),
+    法人私有的宅基地建筑屋顶("法人私有的宅基地建筑屋顶","frsydzjd","法务类型"),
+    其他("其他","other","公用");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 编码
+     */
+    private String type;
+
+
+    public static String getNameByCode(String code) {
+        String name = null;
+        for(CommonEnum obj: CommonEnum.values()) {
+            if (obj.getCode().equals(code)) {
+                name = obj.getName();
+                break;
+            }
+        }
+        return StringUtils.isEmpty(name)?code:name;
+    }
+
+    public static String getNameByCodeList(List<String> codes) {
+
+
+        String name = null;
+        for (String code : codes) {
+            for(CommonEnum obj: CommonEnum.values()) {
+                if (obj.getCode().equals(code)) {
+                    name =     name == null?obj.getName(): name +","+obj.getName() ;
+                }
+            }
+        }
+        return StringUtils.isEmpty(name)? String.valueOf(codes) :name;
+    }
+}

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

@@ -10,5 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2024-08-21
  */
 public interface BasicGridAuditingMapper extends BaseMapper<BasicGridAuditing> {
+    String getInstanceIdByhouseId(String peasantHouseholdId);
 
 }

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

@@ -11,5 +11,5 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingAuditing;
  * @date 2024-04-01
  */
 public interface FinancingAuditingMapper extends BaseMapper<FinancingAuditing> {
-
+    String getInstanceIdByhouseId(String peasantHouseholdId);
 }

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

@@ -10,5 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2024-08-08
  */
 public interface HygfWorkOrderStationAuditingMapper extends BaseMapper<HygfWorkOrderStationAuditing> {
+    String getInstanceIdByhouseId(String peasantHouseholdId);
 
 }

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

@@ -22,4 +22,6 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
 			@Param("ownersName") String ownersName, @Param("serviceAgent") String serviceAgent,
 			@Param("regionalCompaniesName") String regionalCompaniesName, @Param("processStatus") String processStatus,
 			@Param("province") String province);
+
+	String getInstanceIdByhouseId(String peasantHouseholdId);
 }

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAuditingMapper">
 
+
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select instance_id From hygf_basic_grid_auditing where peasant_household_id  = #{peasantHouseholdId} Limit 1
+
+    </select>
 </mapper>

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

 <?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="com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingAuditingMapper">
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select instance_id From hygf_financing_auditing where peasant_household_id  = #{peasantHouseholdId} Limit 1
 
+    </select>
 </mapper>

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

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.HygfWorkOrderStationAuditingMapper">
 
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select instance_id From hygf_work_order_station_auditing where power_station_id  = #{peasantHouseholdId} Limit 1
+
+    </select>
 </mapper>

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

@@ -39,4 +39,7 @@
 <!--    GROUP BY hygf_peasant_household.sequence_nbr-->
     ORDER BY hygf_power_station.rec_date desc
 </select>
+    <select id="getInstanceIdByhouseId" resultType="java.lang.String">
+        select process_instance_id From hygf_power_station where peasant_household_id  = #{peasantHouseholdId}
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.google.common.net.HttpHeaders;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
@@ -48,12 +49,26 @@ public class CommonController {
                          @RequestParam(required = false)String peasantHouseholdId,
                          @RequestParam(required = false)String processInstanceId) throws IOException {
 
-
-        commonService.downZiliao(surveyInformationId,peasantHouseholdId,processInstanceId);
+// 设置响应头
+        response.setContentType("application/zip");
+        commonService.downZiliao(surveyInformationId,peasantHouseholdId,processInstanceId,response);
 
 
     }
 
 
+    /**
+     * 设备信息下载
+     *
+     * @return
+     */
+    @GetMapping(value = "/getSchedule")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "资料下载进度获取", notes = "资料下载进度获取")
+    public Object getSchedule(String peasantHouseholdId) {
+
+     return commonService.getSchedule(peasantHouseholdId);
+
 
+    }
 }

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

@@ -769,38 +769,38 @@ public class SurveyInformationServiceImpl
 		}
 		surveyInfoAllDto.setAcceptanceCheck(acceptanceCheck);
 
-//		if (!StringUtils.isEmpty(processInstanceId)) {
-//			try {
-//				Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(processInstanceId).getResult();
-//				List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger");
-//				if (flowLogger.size() > 0) {
-//					Collections.reverse(flowLogger);
-//				}
-//				List<LinkedHashMap> flowLoggernew = new ArrayList<>();
-//				for (LinkedHashMap linkedHashMap : flowLogger) {
-//					if (linkedHashMap.get("operateDate") != null
-//							&& !linkedHashMap.get("operateDate").toString().isEmpty()) {
-//						LinkedHashMap linke = new LinkedHashMap();
-//						linke.put("approvalStatue", linkedHashMap.get("approvalStatue").toString());
-//						// 审核意见
-//						List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>) linkedHashMap
-//								.get("approvalSuggestion");
-//						if (approvalSuggestion != null && !approvalSuggestion.isEmpty()) {
-//							linke.put("approvalSuggestion", approvalSuggestion.get(0).get("message"));
-//						}
-//						linke.put("taskName", linkedHashMap.get("taskName").toString());
-//						linke.put("operator", linkedHashMap.get("operator").toString());
-//						linke.put("operateDate", linkedHashMap.get("operateDate").toString());
-//						flowLoggernew.add(linke);
-//					}
-//				}
-//				LoggerDto loggerDto = new LoggerDto();
-//				loggerDto.setLogger(flowLoggernew);
-//				surveyInfoAllDto.setOrderTracking(loggerDto);
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//			}
-//		}
+		if (!StringUtils.isEmpty(processInstanceId)) {
+			try {
+				Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(processInstanceId).getResult();
+				List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger");
+				if (flowLogger.size() > 0) {
+					Collections.reverse(flowLogger);
+				}
+				List<LinkedHashMap> flowLoggernew = new ArrayList<>();
+				for (LinkedHashMap linkedHashMap : flowLogger) {
+					if (linkedHashMap.get("operateDate") != null
+							&& !linkedHashMap.get("operateDate").toString().isEmpty()) {
+						LinkedHashMap linke = new LinkedHashMap();
+						linke.put("approvalStatue", linkedHashMap.get("approvalStatue").toString());
+						// 审核意见
+						List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>) linkedHashMap
+								.get("approvalSuggestion");
+						if (approvalSuggestion != null && !approvalSuggestion.isEmpty()) {
+							linke.put("approvalSuggestion", approvalSuggestion.get(0).get("message"));
+						}
+						linke.put("taskName", linkedHashMap.get("taskName").toString());
+						linke.put("operator", linkedHashMap.get("operator").toString());
+						linke.put("operateDate", linkedHashMap.get("operateDate").toString());
+						flowLoggernew.add(linke);
+					}
+				}
+				LoggerDto loggerDto = new LoggerDto();
+				loggerDto.setLogger(flowLoggernew);
+				surveyInfoAllDto.setOrderTracking(loggerDto);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
 
 
 		return surveyInfoAllDto;

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

@@ -87,4 +87,5 @@ exception.debug=true
 feign.okhttp.enabled= true
 
 workflow.feign.name=AMOS-API-WORKFLOW-CZ
-repaymentCron=0 0 1 * * ?
+repaymentCron=0 0 1 * * ?
\ No newline at end of file
+urlHttp=http://47.92.234.253:8088
\ No newline at end of file