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

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

@@ -83,7 +83,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
                } else if (item.getSurveyOrNot() == 1) {
                    item.setSurveyOrNotText("已勘察");
                } else if (item.getSurveyOrNot() == 2) {
-                   item.setSurveyOrNotText("提交审核");
+                   item.setSurveyOrNotText("审核中");
+               } else if (item.getSurveyOrNot() == 3) {
+                   item.setSurveyOrNotText("审核完成");
                }
            }
 

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper;
@@ -55,6 +56,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     DesignInformationMapper designInformationMapper;
     @Autowired
     DesignInformationServiceImpl designInformationService;
+    @Autowired
+    PeasantHouseholdServiceImpl peasantHouseholdService;
 
     private static final String IDX_REQUEST_STATE="200";
     private static final String VERIFY_RESULT_YES="0";
@@ -84,7 +87,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
      * 分页查询
      */
     public Page<PowerStationDto> queryForPowerStationPage(Page<PowerStationDto> page,@Condition(Operator.like) String powerStationCode,@Condition(Operator.like) String ownersName,String serviceAgent)   {
-        return this.queryForPage(page, null, false,powerStationCode,ownersName,serviceAgent);
+        return this.queryForPage(page, "rec_date", false,powerStationCode,ownersName,serviceAgent);
     }
 
     /**
@@ -174,6 +177,13 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     powerStation.setFlowTaskId(flowTaskId);
                 }
                 powerStationService.savePowerStation(powerStation, flag);
+                if(!flag){
+                    //更新农户状态
+                    String peasantHouseholdId = powerStation.getPeasantHouseholdId();
+                    PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId));
+                    peasantHousehold.setSurveyOrNot(3);
+                    peasantHouseholdService.saveOrUpdate(peasantHousehold);
+                }
             }
         }catch (Exception e){
             throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");

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

@@ -93,7 +93,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
      * 分页查询
      */
     public Page<SurveyInformationDto> queryForSurveyInformationPage(Page<SurveyInformationDto> page)   {
-        return this.queryForPage(page, null, false);
+        return this.queryForPage(page, "rec_date", false);
     }
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -97,7 +97,10 @@ public class DemoController extends BaseController {
 //        Object o=this.monitorFanIndicatorImpl.getIndicatoralueAvage("1668801435891929089","60秒平均风速");
 //        System.out.println(o.toString());
         QueryWrapper<MonitorFanIndicator> QueryWrapper = new QueryWrapper<>();
-        QueryWrapper.eq("gateway", "1668801435891929089");
+//        夏造风电
+//        QueryWrapper.eq("gateway", "1668801435891929089");
+//        泰和光伏
+        QueryWrapper.eq("gateway", "1669524885619085313");
         long DATE = new Date().getTime();
         System.out.println(DATE);
         List<MonitorFanIndicator> list = monitorFanIndicatorregionMapper.selectList(QueryWrapper);
@@ -151,7 +154,10 @@ public class DemoController extends BaseController {
     public void demoTest5() {
 //！！！！！！！！！！！！！！注意 初始化升压站的时候需要先更新monitor_fan_indicator_copy2表数据 且修改entity的表映射为monitor_fan_indicator_copy2
         QueryWrapper<MonitorFanIndicator> QueryWrapper = new QueryWrapper<>();
-        QueryWrapper.eq("gateway", "1668801570352926721");
+//        夏造风电升压站
+//        QueryWrapper.eq("gateway", "1668801570352926721");
+//        泰和前进光伏站
+        QueryWrapper.eq("gateway", "1669525017559306241");
 //        QueryWrapper.eq("gateway", "1668801570352926721").eq("front_module","电量表计");
         long DATE = new Date().getTime();
         System.out.println(DATE);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -443,7 +443,11 @@ public class MonitorFanIdxController extends BaseController {
         List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
         for (StationBasic stationBasic : stationBasics) {
             String gatewayId = stationBasic.getBoosterGatewayId();
+            if ("夏造风电站".equals(stationBasic.getStationName())) {
                 monitorFanIndicator.getMajorAnalogQuantityByPage(gatewayId, stationBasic.getSequenceNbr().toString());
+            } else if ("泰和前进光伏站".equals(stationBasic.getStationName())) {
+                monitorFanIndicator.getMajorAnalogQuantityByPageByTHGF(gatewayId, stationBasic.getSequenceNbr().toString());
+            }
         }
         return CommonResponseUtil.success();
     }

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

@@ -294,7 +294,7 @@ public class MonitoringServiceImpl {
             TabDto tab1 = new TabDto("集电线路图", "1");
             TabDto tab2 = new TabDto("运行列表", "2");
             TabDto tab3 = new TabDto("升压站监控", "3");
-            TabDto tab4 = new TabDto("电量表记", "4");
+            TabDto tab4 = new TabDto("电量表计", "4");
             TabDto tab5 = new TabDto("故障信息", "5");
             tabDtoList.add(tab0);
             tabDtoList.add(tab1);
@@ -307,7 +307,7 @@ public class MonitoringServiceImpl {
             TabDto tab7 = new TabDto("集电线路图", "7");
             TabDto tab8 = new TabDto("运行列表", "8");
             TabDto tab9 = new TabDto("升压站监控", "9");
-            TabDto tab10 = new TabDto("电量表记", "10");
+            TabDto tab10 = new TabDto("电量表计", "10");
             TabDto tab11 = new TabDto("故障信息", "11");
             TabDto tab12 = new TabDto("集中式-离散率", "12");
             TabDto tab13 = new TabDto("组串式-离散率", "13");

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

@@ -64,7 +64,7 @@ emqx.max-inflight=1000
 
 
 ## influxDB
-#spring.influx.url= http://139.9.170.47:8086
+#spring.influx.url= http://172.16.3.155:8186
 #spring.influx.password=admin
 #spring.influx.user=admin
 #spring.influx.database=iot_platform

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java

@@ -389,13 +389,20 @@ public class EquipmentCategoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/exportImage")
 	@ApiOperation(httpMethod = "GET", value = "设备监管码下载", notes = "设备监管码下载")
-	public void exportImage(HttpServletResponse response, @RequestParam("code") String code, @RequestParam("type") String type) throws IOException, FileNotFoundException {
+	public void exportImage(HttpServletResponse response, @RequestParam("code") String code, @RequestParam("type") String type, @RequestParam(value = "elevatorCode", required = false) String elevatorCode) throws IOException, FileNotFoundException {
 		ImageSizeEnums imageSizeEnums = ImageSizeEnums.getEnumByCode(type);
 		// 获取resources目录下的文件输入流
-		InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/"+imageSizeEnums.getBgPath());
-		File QrCodeFile = File.createTempFile(code, ".png");
-		ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX+code, "", code, imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+		InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
+		File QrCodeFile;
+		if (ImageSizeEnums.DT.getCode().equals(type)) {
+			QrCodeFile = File.createTempFile(elevatorCode, ".png");
+			ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + code, "", elevatorCode, imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+			ImageUtils.downloadResource(elevatorCode + ".png", QrCodeFile.getAbsolutePath(), response);
+		} else {
+			QrCodeFile = File.createTempFile(code, ".png");
+			ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + code, "", code, imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
 			ImageUtils.downloadResource(code + ".png", QrCodeFile.getAbsolutePath(), response);
+		}
 		QrCodeFile.delete();
 	}
 
@@ -434,9 +441,9 @@ public class EquipmentCategoryController extends BaseController {
 		}
 		for (EquipExportVo equipExportDatum : unique) {
 			InputStream bgImgFile = getClass().getClassLoader().getResourceAsStream("temp/" + imageSizeEnums.getBgPath());
-			if ("DT".equals(type) && !ObjectUtils.isEmpty(equipExportDatum.getCode96333())) {
+			if (ImageSizeEnums.DT.getCode().equals(type) && !ObjectUtils.isEmpty(equipExportDatum.getCode96333()) && !ObjectUtils.isEmpty(equipExportDatum.getSupervisoryCode())) {
 				File QrCodeFile = File.createTempFile(equipExportDatum.getCode96333() + "+", ".png");
-				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.getCode96333(), "", equipExportDatum.getCode96333(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
+				ImageUtils.creatQRCode(QrCodeFile, bgImgFile, imageSizeEnums.getWith(), imageSizeEnums.getHeight(), REGULATORY_CODE_PREFIX + equipExportDatum.getSupervisoryCode(), "", equipExportDatum.getCode96333(), imageSizeEnums.getSize(), imageSizeEnums.getImagesX(), imageSizeEnums.getImagesY(), imageSizeEnums.getText1X(), imageSizeEnums.getText1Y(), imageSizeEnums.getText2X(), imageSizeEnums.getText2Y());
 				fileList.add(new File(QrCodeFile.getAbsolutePath()));
 			} else if (!ObjectUtils.isEmpty(equipExportDatum.getSupervisoryCode())) {
 				File QrCodeFile = File.createTempFile(equipExportDatum.getSupervisoryCode() + "+", ".png");

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/LoginController.java

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 /**
  * @author zjw
@@ -18,7 +20,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
  */
 
 @RestController
-@RequestMapping(value = "/weapp/api")
+@RequestMapping(value = "/wechat/api")
 @Api(tags = "小程序登录api")
 public class LoginController {
 
@@ -103,7 +105,7 @@ public class LoginController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(value = "获取机器人登录token",  notes = "获取机器人登录token")
     @GetMapping(value = "/acquireToken")
-    synchronized  public String getRobotLoginToken() {
-        return amosRequestContext.getToken();
+    synchronized  public ResponseModel<String> getRobotLoginToken() {
+        return ResponseHelper.buildResponse(amosRequestContext.getToken());
     }
 }