解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>amos-boot-biz-common</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+          <groupId>cn.hutool</groupId>
+          <artifactId>hutool-all</artifactId>
+          <version>5.7.22</version>
+        </dependency>
       <dependency>
           <groupId>com.yeejoin</groupId>
           <artifactId>amos-component-influxdb</artifactId>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/ESDto/ESEquipments.java

+package com.yeejoin.amos.boot.module.jxiop.biz.ESDto;
+
+import io.github.classgraph.json.Id;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/8/8
+ */
+
+@Data
+@Accessors(chain = true)
+@Document(indexName = "jxiop_equipments")
+public class ESEquipments {
+    @Id
+    private String  id;
+
+    @Field(type = FieldType.Text, index = false)
+    private String  address;
+    @Field(type = FieldType.Text, index = false)
+    private String  dataType;
+    @Field(type = FieldType.Text)
+    private String  equipmentSpecificName;
+    @Field(type = FieldType.Keyword)
+    private String  gatewayId;
+    @Field(type = FieldType.Text)
+    private String  isAlarm;
+    @Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false)
+    private Date createdTime;
+    @Field(type = FieldType.Text , index = false)
+    private String  unit;
+    @Field(type = FieldType.Text, index = false)
+    private String  value;
+    @Field(type = FieldType.Double, index = false)
+    private Double  valueDouble;
+    @Field(type = FieldType.Text , index = false)
+    private String  valueLabel;
+    @Field(type = FieldType.Text , index = false)
+    private String  traceId;
+    @Field(type = FieldType.Keyword )
+    private String  equipmentIndexName;
+    @Field(type = FieldType.Keyword )
+    private String  equipmentNumber;
+    @Field(type = FieldType.Text)
+    private String  frontModule;
+    @Field(type = FieldType.Text)
+    private String  systemType;
+    @Field(type = FieldType.Text , index = false)
+    private String  pictureName;
+    @Field(type = FieldType.Text , index = false)
+    private String  displayName;
+
+
+    public ESEquipments(Double valueDouble,String id, String address, String dataType, String equipmentSpecificName, String gatewayId, String isAlarm, Date createdTime, String unit, String value, String valueLabel, String traceId, String equipmentIndexName, String equipmentNumber, String frontModule, String systemType, String pictureName, String displayName) {
+
+        this.valueDouble = valueDouble;
+        this.id = id;
+        this.address = address;
+        this.dataType = dataType;
+        this.equipmentSpecificName = equipmentSpecificName;
+        this.gatewayId = gatewayId;
+        this.isAlarm = isAlarm;
+        this.createdTime = createdTime;
+        this.unit = unit;
+        this.value = value;
+        this.valueLabel = valueLabel;
+        this.traceId = traceId;
+        this.equipmentIndexName = equipmentIndexName;
+        this.equipmentNumber = equipmentNumber;
+        this.frontModule = frontModule;
+        this.systemType = systemType;
+        this.pictureName = pictureName;
+        this.displayName = displayName;
+    }
+
+
+    public ESEquipments() {
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/AnalyseController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author system_generator
+ * @date 2023-08-11
+ */
+@RestController
+@Api(tags = "智能分析")
+@RequestMapping(value = "/analyse")
+public class AnalyseController extends BaseController {
+
+    @Autowired
+    CommonServiceImpl commonServiceImpl;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "工况测点区间划分-风机", notes = "工况测点区间划分-风机")
+    @GetMapping(value = "/getFanConditionVariablesByTime")
+    public void getFanConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
+        commonServiceImpl.getFanConditionVariablesByTime(startTime, endTime);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "工况测点区间划分-光伏", notes = "工况测点区间划分-光伏")
+    @GetMapping(value = "/getPvConditionVariablesByTime")
+    public void getPvConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
+        commonServiceImpl.getPvConditionVariablesByTime(startTime, endTime);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
+    @GetMapping(value = "/getFanConditionVariablesByTimeAnalyse")
+    public void getFanConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
+        commonServiceImpl.getFanConditionVariablesByTimeAnalyse(startTime, endTime);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
+    @GetMapping(value = "/getPvConditionVariablesByTimeAnalyse")
+    public void getPvConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
+        commonServiceImpl.getPvConditionVariablesByTimeAnalyse(startTime, endTime);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "中心值计算-风机", notes = "中心值计算-风机")
+    @GetMapping(value = "/getFanConditionVariablesByTimeAnalyse1")
+    public void getFanConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
+        commonServiceImpl.getFanConditionVariablesByTimeAnalyse1(startTime, endTime);
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "中心值计算-光伏", notes = "中心值计算-光伏")
+    @GetMapping(value = "/getPvConditionVariablesByTimeAnalyse1")
+    public void getPvConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
+        commonServiceImpl.getPvConditionVariablesByTimeAnalyse1(startTime, endTime);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "获取influxdb数据", notes = "获取influxdb数据")
+    @GetMapping(value = "/getInfluxdbDataByConditon")
+    public ResponseModel<List<Map<String, Object>>> getInfluxdbDataByConditon(@RequestParam String stationType, @RequestParam String pointId, @RequestParam String startTime, @RequestParam String endTime) {
+       return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType,pointId,startTime, endTime)) ;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanHealthIndexServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-health-index")
+public class IdxBizFanHealthIndexController extends BaseController {
+
+    @Autowired
+    IdxBizFanHealthIndexServiceImpl idxBizFanHealthIndexServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanHealthIndexDto> save(@RequestBody IdxBizFanHealthIndexDto model) {
+	    model = idxBizFanHealthIndexServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanHealthIndexDto> updateBySequenceNbrIdxBizFanHealthIndex(@RequestBody IdxBizFanHealthIndexDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanHealthIndexServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanHealthIndexServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanHealthIndexDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanHealthIndexServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanHealthIndexDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanHealthIndexDto> page = new Page<IdxBizFanHealthIndexDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanHealthIndexServiceImpl.queryForIdxBizFanHealthIndexPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanHealthIndexDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanHealthIndexServiceImpl.queryForIdxBizFanHealthIndexList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthLevelController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanHealthLevelDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanHealthLevelServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-health-level")
+public class IdxBizFanHealthLevelController extends BaseController {
+
+    @Autowired
+    IdxBizFanHealthLevelServiceImpl idxBizFanHealthLevelServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanHealthLevelDto> save(@RequestBody IdxBizFanHealthLevelDto model) {
+	    model = idxBizFanHealthLevelServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanHealthLevelDto> updateBySequenceNbrIdxBizFanHealthLevel(@RequestBody IdxBizFanHealthLevelDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanHealthLevelDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanHealthLevelDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanHealthLevelDto> page = new Page<IdxBizFanHealthLevelDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.queryForIdxBizFanHealthLevelPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanHealthLevelDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanHealthLevelServiceImpl.queryForIdxBizFanHealthLevelList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanPointProcessVariableClassificationController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanPointProcessVariableClassificationServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-point-process-variable-classification")
+public class IdxBizFanPointProcessVariableClassificationController extends BaseController {
+
+    @Autowired
+    IdxBizFanPointProcessVariableClassificationServiceImpl idxBizFanPointProcessVariableClassificationServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanPointProcessVariableClassificationDto> save(@RequestBody IdxBizFanPointProcessVariableClassificationDto model) {
+	    model = idxBizFanPointProcessVariableClassificationServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanPointProcessVariableClassificationDto> updateBySequenceNbrIdxBizFanPointProcessVariableClassification(@RequestBody IdxBizFanPointProcessVariableClassificationDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanPointProcessVariableClassificationDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanPointProcessVariableClassificationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanPointProcessVariableClassificationDto> page = new Page<IdxBizFanPointProcessVariableClassificationDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.queryForIdxBizFanPointProcessVariableClassificationPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanPointProcessVariableClassificationDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.queryForIdxBizFanPointProcessVariableClassificationList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanPointTagController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointTagDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanPointTagServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-point-tag")
+public class IdxBizFanPointTagController extends BaseController {
+
+    @Autowired
+    IdxBizFanPointTagServiceImpl idxBizFanPointTagServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanPointTagDto> save(@RequestBody IdxBizFanPointTagDto model) {
+	    model = idxBizFanPointTagServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanPointTagDto> updateBySequenceNbrIdxBizFanPointTag(@RequestBody IdxBizFanPointTagDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanPointTagServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanPointTagServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanPointTagDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanPointTagServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanPointTagDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanPointTagDto> page = new Page<IdxBizFanPointTagDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanPointTagServiceImpl.queryForIdxBizFanPointTagPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanPointTagDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanPointTagServiceImpl.queryForIdxBizFanPointTagList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanPointVarCentralValueController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointVarCentralValueDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanPointVarCentralValueServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-point-var-central-value")
+public class IdxBizFanPointVarCentralValueController extends BaseController {
+
+    @Autowired
+    IdxBizFanPointVarCentralValueServiceImpl idxBizFanPointVarCentralValueServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanPointVarCentralValueDto> save(@RequestBody IdxBizFanPointVarCentralValueDto model) {
+	    model = idxBizFanPointVarCentralValueServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanPointVarCentralValueDto> updateBySequenceNbrIdxBizFanPointVarCentralValue(@RequestBody IdxBizFanPointVarCentralValueDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCentralValueServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanPointVarCentralValueServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanPointVarCentralValueDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCentralValueServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanPointVarCentralValueDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanPointVarCentralValueDto> page = new Page<IdxBizFanPointVarCentralValueDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCentralValueServiceImpl.queryForIdxBizFanPointVarCentralValuePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanPointVarCentralValueDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCentralValueServiceImpl.queryForIdxBizFanPointVarCentralValueList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanPointVarCorrelationController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointVarCorrelationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanPointVarCorrelationServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-point-var-correlation")
+public class IdxBizFanPointVarCorrelationController extends BaseController {
+
+    @Autowired
+    IdxBizFanPointVarCorrelationServiceImpl idxBizFanPointVarCorrelationServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanPointVarCorrelationDto> save(@RequestBody IdxBizFanPointVarCorrelationDto model) {
+	    model = idxBizFanPointVarCorrelationServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanPointVarCorrelationDto> updateBySequenceNbrIdxBizFanPointVarCorrelation(@RequestBody IdxBizFanPointVarCorrelationDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCorrelationServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanPointVarCorrelationServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanPointVarCorrelationDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCorrelationServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanPointVarCorrelationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanPointVarCorrelationDto> page = new Page<IdxBizFanPointVarCorrelationDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCorrelationServiceImpl.queryForIdxBizFanPointVarCorrelationPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanPointVarCorrelationDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanPointVarCorrelationServiceImpl.queryForIdxBizFanPointVarCorrelationList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWarningRecordController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanWarningRecordDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRecordServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-warning-record")
+public class IdxBizFanWarningRecordController extends BaseController {
+
+    @Autowired
+    IdxBizFanWarningRecordServiceImpl idxBizFanWarningRecordServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanWarningRecordDto> save(@RequestBody IdxBizFanWarningRecordDto model) {
+	    model = idxBizFanWarningRecordServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanWarningRecordDto> updateBySequenceNbrIdxBizFanWarningRecord(@RequestBody IdxBizFanWarningRecordDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanWarningRecordDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanWarningRecordDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanWarningRecordDto> page = new Page<IdxBizFanWarningRecordDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanWarningRecordDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanWarningRecordServiceImpl.queryForIdxBizFanWarningRecordList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWarningRuleSetController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanWarningRuleSetDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizFanWarningRuleSetServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-fan-warning-rule-set")
+public class IdxBizFanWarningRuleSetController extends BaseController {
+
+    @Autowired
+    IdxBizFanWarningRuleSetServiceImpl idxBizFanWarningRuleSetServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizFanWarningRuleSetDto> save(@RequestBody IdxBizFanWarningRuleSetDto model) {
+	    model = idxBizFanWarningRuleSetServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizFanWarningRuleSetDto> updateBySequenceNbrIdxBizFanWarningRuleSet(@RequestBody IdxBizFanWarningRuleSetDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizFanWarningRuleSetServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizFanWarningRuleSetServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizFanWarningRuleSetDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizFanWarningRuleSetServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizFanWarningRuleSetDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizFanWarningRuleSetDto> page = new Page<IdxBizFanWarningRuleSetDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizFanWarningRuleSetServiceImpl.queryForIdxBizFanWarningRuleSetPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizFanWarningRuleSetDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizFanWarningRuleSetServiceImpl.queryForIdxBizFanWarningRuleSetList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvHealthIndexServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-health-index")
+public class IdxBizPvHealthIndexController extends BaseController {
+
+    @Autowired
+    IdxBizPvHealthIndexServiceImpl idxBizPvHealthIndexServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvHealthIndexDto> save(@RequestBody IdxBizPvHealthIndexDto model) {
+	    model = idxBizPvHealthIndexServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvHealthIndexDto> updateBySequenceNbrIdxBizPvHealthIndex(@RequestBody IdxBizPvHealthIndexDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvHealthIndexServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvHealthIndexServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvHealthIndexDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvHealthIndexServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvHealthIndexDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvHealthIndexDto> page = new Page<IdxBizPvHealthIndexDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvHealthIndexServiceImpl.queryForIdxBizPvHealthIndexPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvHealthIndexDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvHealthIndexServiceImpl.queryForIdxBizPvHealthIndexList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthLevelController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthLevelDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvHealthLevelServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-health-level")
+public class IdxBizPvHealthLevelController extends BaseController {
+
+    @Autowired
+    IdxBizPvHealthLevelServiceImpl idxBizPvHealthLevelServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvHealthLevelDto> save(@RequestBody IdxBizPvHealthLevelDto model) {
+	    model = idxBizPvHealthLevelServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvHealthLevelDto> updateBySequenceNbrIdxBizPvHealthLevel(@RequestBody IdxBizPvHealthLevelDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvHealthLevelServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvHealthLevelServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvHealthLevelDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvHealthLevelServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvHealthLevelDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvHealthLevelDto> page = new Page<IdxBizPvHealthLevelDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvHealthLevelServiceImpl.queryForIdxBizPvHealthLevelPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvHealthLevelDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvHealthLevelServiceImpl.queryForIdxBizPvHealthLevelList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvPointProcessVariableClassificationController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvPointProcessVariableClassificationServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-point-process-variable-classification")
+public class IdxBizPvPointProcessVariableClassificationController extends BaseController {
+
+    @Autowired
+    IdxBizPvPointProcessVariableClassificationServiceImpl idxBizPvPointProcessVariableClassificationServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvPointProcessVariableClassificationDto> save(@RequestBody IdxBizPvPointProcessVariableClassificationDto model) {
+	    model = idxBizPvPointProcessVariableClassificationServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvPointProcessVariableClassificationDto> updateBySequenceNbrIdxBizPvPointProcessVariableClassification(@RequestBody IdxBizPvPointProcessVariableClassificationDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvPointProcessVariableClassificationServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvPointProcessVariableClassificationServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvPointProcessVariableClassificationDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvPointProcessVariableClassificationServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvPointProcessVariableClassificationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvPointProcessVariableClassificationDto> page = new Page<IdxBizPvPointProcessVariableClassificationDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvPointProcessVariableClassificationServiceImpl.queryForIdxBizPvPointProcessVariableClassificationPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvPointProcessVariableClassificationDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvPointProcessVariableClassificationServiceImpl.queryForIdxBizPvPointProcessVariableClassificationList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvPointTagController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointTagDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvPointTagServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-point-tag")
+public class IdxBizPvPointTagController extends BaseController {
+
+    @Autowired
+    IdxBizPvPointTagServiceImpl idxBizPvPointTagServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvPointTagDto> save(@RequestBody IdxBizPvPointTagDto model) {
+	    model = idxBizPvPointTagServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvPointTagDto> updateBySequenceNbrIdxBizPvPointTag(@RequestBody IdxBizPvPointTagDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvPointTagServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvPointTagServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvPointTagDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvPointTagServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvPointTagDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvPointTagDto> page = new Page<IdxBizPvPointTagDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvPointTagServiceImpl.queryForIdxBizPvPointTagPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvPointTagDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvPointTagServiceImpl.queryForIdxBizPvPointTagList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvPointVarCentralValueController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointVarCentralValueDto;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvPointVarCentralValueServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-point-var-central-value")
+public class IdxBizPvPointVarCentralValueController extends BaseController {
+
+    @Autowired
+    IdxBizPvPointVarCentralValueServiceImpl idxBizPvPointVarCentralValueServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvPointVarCentralValueDto> save(@RequestBody IdxBizPvPointVarCentralValueDto model) {
+	    model = idxBizPvPointVarCentralValueServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvPointVarCentralValueDto> updateBySequenceNbrIdxBizPvPointVarCentralValue(@RequestBody IdxBizPvPointVarCentralValueDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCentralValueServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvPointVarCentralValueServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvPointVarCentralValueDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCentralValueServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvPointVarCentralValueDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvPointVarCentralValueDto> page = new Page<IdxBizPvPointVarCentralValueDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCentralValueServiceImpl.queryForIdxBizPvPointVarCentralValuePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvPointVarCentralValueDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCentralValueServiceImpl.queryForIdxBizPvPointVarCentralValueList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvPointVarCorrelationController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointVarCorrelationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvPointVarCorrelationServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-point-var-correlation")
+public class IdxBizPvPointVarCorrelationController extends BaseController {
+
+    @Autowired
+    IdxBizPvPointVarCorrelationServiceImpl idxBizPvPointVarCorrelationServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvPointVarCorrelationDto> save(@RequestBody IdxBizPvPointVarCorrelationDto model) {
+	    model = idxBizPvPointVarCorrelationServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvPointVarCorrelationDto> updateBySequenceNbrIdxBizPvPointVarCorrelation(@RequestBody IdxBizPvPointVarCorrelationDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCorrelationServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvPointVarCorrelationServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvPointVarCorrelationDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCorrelationServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvPointVarCorrelationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvPointVarCorrelationDto> page = new Page<IdxBizPvPointVarCorrelationDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCorrelationServiceImpl.queryForIdxBizPvPointVarCorrelationPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvPointVarCorrelationDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvPointVarCorrelationServiceImpl.queryForIdxBizPvPointVarCorrelationList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWarningRecordController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvWarningRecordDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRecordServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-warning-record")
+public class IdxBizPvWarningRecordController extends BaseController {
+
+    @Autowired
+    IdxBizPvWarningRecordServiceImpl idxBizPvWarningRecordServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvWarningRecordDto> save(@RequestBody IdxBizPvWarningRecordDto model) {
+	    model = idxBizPvWarningRecordServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvWarningRecordDto> updateBySequenceNbrIdxBizPvWarningRecord(@RequestBody IdxBizPvWarningRecordDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvWarningRecordServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvWarningRecordServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvWarningRecordDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvWarningRecordServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvWarningRecordDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvWarningRecordDto> page = new Page<IdxBizPvWarningRecordDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvWarningRecordServiceImpl.queryForIdxBizPvWarningRecordPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvWarningRecordDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvWarningRecordServiceImpl.queryForIdxBizPvWarningRecordList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWarningRuleSetController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvWarningRuleSetDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxBizPvWarningRuleSetServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-biz-pv-warning-rule-set")
+public class IdxBizPvWarningRuleSetController extends BaseController {
+
+    @Autowired
+    IdxBizPvWarningRuleSetServiceImpl idxBizPvWarningRuleSetServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxBizPvWarningRuleSetDto> save(@RequestBody IdxBizPvWarningRuleSetDto model) {
+	    model = idxBizPvWarningRuleSetServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxBizPvWarningRuleSetDto> updateBySequenceNbrIdxBizPvWarningRuleSet(@RequestBody IdxBizPvWarningRuleSetDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxBizPvWarningRuleSetServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxBizPvWarningRuleSetServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxBizPvWarningRuleSetDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxBizPvWarningRuleSetServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxBizPvWarningRuleSetDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxBizPvWarningRuleSetDto> page = new Page<IdxBizPvWarningRuleSetDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxBizPvWarningRuleSetServiceImpl.queryForIdxBizPvWarningRuleSetPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxBizPvWarningRuleSetDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxBizPvWarningRuleSetServiceImpl.queryForIdxBizPvWarningRuleSetList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxExplorerController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxExplorerDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.IdxExplorerServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/idx-explorer")
+public class IdxExplorerController extends BaseController {
+
+    @Autowired
+    IdxExplorerServiceImpl idxExplorerServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<IdxExplorerDto> save(@RequestBody IdxExplorerDto model) {
+	    model = idxExplorerServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<IdxExplorerDto> updateBySequenceNbrIdxExplorer(@RequestBody IdxExplorerDto model,@PathVariable(value = "sequenceNbr") String sequenceNbr) {
+	    model.setId(sequenceNbr);
+	    return ResponseHelper.buildResponse(idxExplorerServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(idxExplorerServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<IdxExplorerDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(idxExplorerServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<IdxExplorerDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<IdxExplorerDto> page = new Page<IdxExplorerDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(idxExplorerServiceImpl.queryForIdxExplorerPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<IdxExplorerDto>> selectForList() {
+	    return ResponseHelper.buildResponse(idxExplorerServiceImpl.queryForIdxExplorerList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TestController.java

-package com.yeejoin.amos.boot.module.jxiop.biz.controller;
-
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizC80c;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizHjev;
-import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-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;
-
-import java.util.List;
-
-/**
- * 
- *
- * @author system_generator
- * @date 2023-08-11
- */
-@RestController
-@Api(tags = "工况测点测试")
-@RequestMapping(value = "/test")
-public class TestController extends BaseController {
-
-    @Autowired
-	CommonServiceImpl commonServiceImpl;
-
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询-风电",   notes = "列表全部数据查询")
-	@GetMapping(value = "/listfan")
-	public ResponseModel<List<IdxBizC80c>> selectForListFan() {
-     return ResponseHelper.buildResponse(commonServiceImpl.getAllFanstationTestPoint().subList(0,20));
-	}
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询-光伏",   notes = "列表全部数据查询")
-	@GetMapping(value = "/listpv")
-	public ResponseModel<List<IdxBizHjev>> selectForListPV() {
-		return ResponseHelper.buildResponse(commonServiceImpl.getAllPVstationTestPoint().subList(0,20));
-	}
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "test",   notes = "列表全部数据查询")
-	@GetMapping(value = "/test")
-	public void selectForListTest() {
-		 commonServiceImpl.getGateWayId();
-	}
-}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizC80cDto.java

@@ -45,10 +45,10 @@ public class IdxBizC80cDto  {
     private Double correlationCoefficient;
 
     @TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     @TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     @ApiModelProperty(value = "片区")
     @TableField("ARAE")

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanHealthIndexDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanHealthIndexDto", description="")
+public class IdxBizFanHealthIndexDto{
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private Date recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "分析维度类型")
+    @TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    @ApiModelProperty(value = "分析维度seq")
+    @TableField("ANALYSIS_OBJ_SEQ")
+    private Integer analysisObjSeq;
+
+    @TableField("WEIGTH")
+    private Double weigth;
+
+    @TableField("HEALTH_INDEX")
+    private Double healthIndex;
+
+    @ApiModelProperty(value = "健康等级")
+    @TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    @TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    @TableField("ANALYSIS_START_TIME")
+    private Date analysisStartTime;
+
+    @TableField("ANALYSIS_END_TIME")
+    private Date analysisEndTime;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子系统")
+    @TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    @ApiModelProperty(value = "型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    @ApiModelProperty(value = "点表地址")
+    @TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanHealthLevelDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanHealthLevelDto", description="")
+public class IdxBizFanHealthLevelDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "分析维度类型：【全域、区域、场站、设备、子系统、测点】")
+    @TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    @ApiModelProperty(value = "健康等级：【安全、注意、警告、风险】")
+    @TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    @TableField("GROUP_UPPER_LIMIT")
+    private Double groupUpperLimit;
+
+    @TableField("GROUP_LOWER_LIMIT")
+    private Double groupLowerLimit;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanPointProcessVariableClassificationDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanPointProcessVariableClassificationDto", description="")
+public class IdxBizFanPointProcessVariableClassificationDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "工况区间值1")
+    @TableField("INTERVAL_VALUE1")
+    private Double intervalValue1;
+
+    @ApiModelProperty(value = "工况区间值2")
+    @TableField("INTERVAL_VALUE2")
+    private Double intervalValue2;
+
+    @ApiModelProperty(value = "工况区间值3")
+    @TableField("INTERVAL_VALUE3")
+    private Double intervalValue3;
+
+    @ApiModelProperty(value = "工况区间值4")
+    @TableField("INTERVAL_VALUE4")
+    private Double intervalValue4;
+
+    @ApiModelProperty(value = "工况区间值5")
+    @TableField("INTERVAL_VALUE5")
+    private Double intervalValue5;
+
+    @ApiModelProperty(value = "标签")
+    @TableField("TAG_CODE")
+    private String tagCode;
+
+    @ApiModelProperty(value = "设备型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @TableField("POINT_ID")
+    private Long pointId;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子系统")
+    @TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "测点")
+    @TableField("POINT_NAME")
+    private String pointName;
+
+    @TableField("GATEWAY_ID")
+    private Long gatewayId;
+
+    @ApiModelProperty(value = "点表地址")
+    @TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    @ApiModelProperty(value = "KKS码")
+    @TableField("KKS")
+    private String kks;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanPointTagDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanPointTagDto", description="")
+public class IdxBizFanPointTagDto   {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "标签")
+    @TableField("TAG_CODE")
+    private String tagCode;
+
+    @ApiModelProperty(value = "测点")
+    @TableField("POINT_NAME")
+    private String pointName;
+
+    @ApiModelProperty(value = "设备型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @ApiModelProperty(value = "厂站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanPointVarCentralValueDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanPointVarCentralValueDto", description="")
+public class IdxBizFanPointVarCentralValueDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("ANALYSIS_CENTER_VALUE")
+    private Double analysisCenterValue;
+
+    @TableField("ANALYSIS_STD_DEV")
+    private Double analysisStdDev;
+
+    @TableField("INTERVAL_COMBINATION")
+    private String intervalCombination;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子系统")
+    @TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    @ApiModelProperty(value = "型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @TableField("PROCESS_COMBINATION")
+    private String processCombination;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "工况量1区间最小值")
+    @TableField("PROCESS1_MIN")
+    private Double process1Min;
+
+    @ApiModelProperty(value = "工况量1区间最大值")
+    @TableField("PROCESS1_MAX")
+    private Double process1Max;
+
+    @ApiModelProperty(value = "工况变量1ID")
+    @TableField("PROCESS_POINT1_ID")
+    private String processPoint1Id;
+
+    @ApiModelProperty(value = "工况量2区间最小值")
+    @TableField("PROCESS2_MIN")
+    private Double process2Min;
+
+    @ApiModelProperty(value = "工况量2区间最大值")
+    @TableField("PORCESS2_MAX")
+    private Double porcess2Max;
+
+    @ApiModelProperty(value = "工况量3区间最大值")
+    @TableField("PROCESS3_MAX")
+    private Double process3Max;
+
+    @ApiModelProperty(value = "工况量3区间最小值")
+    @TableField("PROCESS3_MIN")
+    private Double process3Min;
+
+    @ApiModelProperty(value = "工况变量3ID")
+    @TableField("PROCESS_POINT3_ID")
+    private String processPoint3Id;
+
+    @ApiModelProperty(value = "工况变量2ID")
+    @TableField("PROCESS_POINT2_ID")
+    private Double processPoint2Id;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanPointVarCorrelationDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanPointVarCorrelationDto", description="")
+public class IdxBizFanPointVarCorrelationDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("CORRELATION_COEFFICIENT")
+    private Double correlationCoefficient;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Long analysisPointId;
+
+    @TableField("PROCESS_POINT_ID")
+    private Long processPointId;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子系统")
+    @TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    @ApiModelProperty(value = "型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @TableField("ANALYSIS_GATEWAY_ID")
+    private String analysisGatewayId;
+
+    @TableField("ANALYSIS_INDEX_ADDRESS")
+    private String analysisIndexAddress;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("PROCESS_GATEWAY_ID")
+    private String processGatewayId;
+
+    @TableField("PROCESS_INDEX_ADDRESS")
+    private String processIndexAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanWarningRecordDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@ApiModel(value="IdxBizFanWarningRecordDto", description="")
+public class IdxBizFanWarningRecordDto{
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "处置状态")
+    @TableField("DISPOSOTION_STATE")
+    private String disposotionState;
+
+    @TableField("HEALTH_INDEX_SEQ")
+    private Integer healthIndexSeq;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @ApiModelProperty(value = "预警等级")
+    @TableField("WARNING_NAME")
+    private String warningName;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子系统")
+    @TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    @ApiModelProperty(value = "型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    @ApiModelProperty(value = "点表地址")
+    @TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanWarningRuleSetDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizFanWarningRuleSetDto", description="")
+public class IdxBizFanWarningRuleSetDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "预警判断条件")
+    @TableField("WARNING_IF")
+    private String warningIf;
+
+    @ApiModelProperty(value = "预警判断连续周期")
+    @TableField("WARNING_CYCLE")
+    private String warningCycle;
+
+    @ApiModelProperty(value = "预警名称（危险、警告、注意）")
+    @TableField("WARNING_NAME")
+    private String warningName;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @ApiModelProperty(value = "分析周期((按天、10min、小时)")
+    @TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子系统")
+    @TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    @ApiModelProperty(value = "型号")
+    @TableField("NUMBER")
+    private String number;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFelkDto.java

@@ -66,7 +66,7 @@ public class IdxBizFelkDto  {
     private String analysisType;
 
     @TableField("ANALYSIS_START_TIME")
-    private LocalTime analysisStartTime;
+    private LocalDateTime analysisStartTime;
 
     @TableField("ANALYSIS_END_TIME")
     private LocalDateTime analysisEndTime;

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizHjevDto.java

@@ -45,10 +45,10 @@ public class IdxBizHjevDto {
     private Double correlationCoefficient;
 
     @TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     @TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     @ApiModelProperty(value = "片区")
     @TableField("ARAE")

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvHealthIndexDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvHealthIndexDto", description="")
+public class IdxBizPvHealthIndexDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "分析维度类型")
+    @TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    @ApiModelProperty(value = "分析维度seq")
+    @TableField("ANALYSIS_OBJ_SEQ")
+    private Integer analysisObjSeq;
+
+    @TableField("WEIGTH")
+    private Double weigth;
+
+    @TableField("HEALTH_INDEX")
+    private Double healthIndex;
+
+    @ApiModelProperty(value = "健康等级")
+    @TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    @ApiModelProperty(value = "分析周期")
+    @TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    @TableField("ANALYSIS_START_TIME")
+    private LocalDateTime analysisStartTime;
+
+    @TableField("ANALYSIS_END_TIME")
+    private LocalDateTime analysisEndTime;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子阵")
+    @TableField("SUBARRAY")
+    private String subarray;
+
+    @ApiModelProperty(value = "厂商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    @ApiModelProperty(value = "点表地址")
+    @TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvHealthLevelDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvHealthLevelDto", description="")
+public class IdxBizPvHealthLevelDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "分析维度类型：【全域、区域、场站、设备、子系统、测点】")
+    @TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    @ApiModelProperty(value = "健康等级：【安全、注意、警告、风险】")
+    @TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    @TableField("GROUP_UPPER_LIMIT")
+    private Double groupUpperLimit;
+
+    @TableField("GROUP_LOWER_LIMIT")
+    private Double groupLowerLimit;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointProcessVariableClassificationDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvPointProcessVariableClassificationDto", description="")
+public class IdxBizPvPointProcessVariableClassificationDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "工况区间值1")
+    @TableField("INTERVAL_VALUE1")
+    private Integer intervalValue1;
+
+    @ApiModelProperty(value = "工况区间值2")
+    @TableField("INTERVAL_VALUE2")
+    private Integer intervalValue2;
+
+    @ApiModelProperty(value = "工况区间值3")
+    @TableField("INTERVAL_VALUE3")
+    private Integer intervalValue3;
+
+    @ApiModelProperty(value = "工况区间值4")
+    @TableField("INTERVAL_VALUE4")
+    private Integer intervalValue4;
+
+    @ApiModelProperty(value = "工况区间值5")
+    @TableField("INTERVAL_VALUE5")
+    private Integer intervalValue5;
+
+    @ApiModelProperty(value = "标签")
+    @TableField("TAG_CODE")
+    private String tagCode;
+
+    @TableField("POINT_ID")
+    private Integer pointId;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "厂商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @ApiModelProperty(value = "子阵")
+    @TableField("SUBARRAY")
+    private String subarray;
+
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    @ApiModelProperty(value = "点表地址")
+    @TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    @ApiModelProperty(value = "KKS码")
+    @TableField("KKS")
+    private String kks;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointTagDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvPointTagDto", description="")
+public class IdxBizPvPointTagDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "标签")
+    @TableField("TAG_CODE")
+    private String tagCode;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    @ApiModelProperty(value = "测点")
+    @TableField("POINT_NAME")
+    private String pointName;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @ApiModelProperty(value = "厂站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "厂商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointVarCentralValueDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvPointVarCentralValueDto", description="")
+public class IdxBizPvPointVarCentralValueDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("ANALYSIS_CENTER_VALUE")
+    private Double analysisCenterValue;
+
+    @TableField("ANALYSIS_STD_DEV")
+    private Double analysisStdDev;
+
+    @TableField("INTERVAL_COMBINATION")
+    private String intervalCombination;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子阵")
+    @TableField("SUBARRAY")
+    private String subarray;
+
+    @ApiModelProperty(value = "产商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @TableField("PROCESS_COMBINATION")
+    private String processCombination;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @TableField("PROCESS2_MIN")
+    private Double process2Min;
+
+    @TableField("PROCESS2_MAX")
+    private Double process2Max;
+
+    @TableField("PROCESS3_MIN")
+    private Double process3Min;
+
+    @TableField("PROCESS3_MAX")
+    private Double process3Max;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointVarCorrelationDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvPointVarCorrelationDto", description="")
+public class IdxBizPvPointVarCorrelationDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("CORRELATION_COEFFICIENT")
+    private Double correlationCoefficient;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @TableField("PROCESS_POINT_ID")
+    private Integer processPointId;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子阵")
+    @TableField("SUBARRAY")
+    private String subarray;
+
+    @ApiModelProperty(value = "厂商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("ANALYSIS_GATEWAY_ID")
+    private String analysisGatewayId;
+
+    @TableField("ANALYSIS_INDEX_ADDRESS")
+    private Integer analysisIndexAddress;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("PROCESS_GATEWAY_ID")
+    private String processGatewayId;
+
+    @TableField("PROCESS_INDEX_ADDRESS")
+    private Integer processIndexAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvWarningRecordDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvWarningRecordDto", description="")
+public class IdxBizPvWarningRecordDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "处置状态")
+    @TableField("DISPOSOTION_STATE")
+    private String disposotionState;
+
+    @TableField("HEALTH_INDEX_SEQ")
+    private Integer healthIndexSeq;
+
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @ApiModelProperty(value = "预警等级")
+    @TableField("WARNING_NAME")
+    private String warningName;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "子阵")
+    @TableField("SUBARRAY")
+    private String subarray;
+
+    @ApiModelProperty(value = "产商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    @ApiModelProperty(value = "网关ID")
+    @TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    @ApiModelProperty(value = "点表地址")
+    @TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvWarningRuleSetDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxBizPvWarningRuleSetDto", description="")
+public class IdxBizPvWarningRuleSetDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @TableId("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    @TableField("RECORD")
+    private String record;
+
+    @TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    @TableField("REC_USER_ID")
+    private String recUserId;
+
+    @TableField("INSTANCE_ID")
+    private String instanceId;
+
+    @TableField("STATUS")
+    private String status;
+
+    @ApiModelProperty(value = "预警判断条件")
+    @TableField("WARNING_IF")
+    private String warningIf;
+
+    @ApiModelProperty(value = "预警判断连续周期")
+    @TableField("WARNING_CYCLE")
+    private String warningCycle;
+
+    @ApiModelProperty(value = "预警名称（危险、警告、注意）")
+    @TableField("WARNING_NAME")
+    private String warningName;
+
+    @ApiModelProperty(value = "分析变量测点ID")
+    @TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    @ApiModelProperty(value = "分析周期((按天、10min、小时)")
+    @TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    @ApiModelProperty(value = "片区")
+    @TableField("ARAE")
+    private String arae;
+
+    @ApiModelProperty(value = "场站")
+    @TableField("STATION")
+    private String station;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "子阵")
+    @TableField("SUBARRAY")
+    private String subarray;
+
+    @ApiModelProperty(value = "厂商")
+    @TableField("MANUFACTURER")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设备类型")
+    @TableField("DEVICE_TYPE")
+    private String deviceType;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizUhefDto.java

@@ -93,4 +93,12 @@ public class IdxBizUhefDto  {
     @TableField("PROCESS3_MAX")
     private Double process3Max;
 
+    private String PROCESS_POINT3_ID;
+
+    private String PROCESS_POINT2_ID;
+
+    private String PROCESS_POINT1_ID;
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizUxfvDto.java

@@ -12,16 +12,14 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-08-14
  */
 @Data
-@ApiModel(value="IdxBizUxfvDto", description="")
-public class IdxBizUxfvDto   {
+@ApiModel(value = "IdxBizUxfvDto", description = "")
+public class IdxBizUxfvDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @TableId("SEQUENCE_NBR")
@@ -101,4 +99,11 @@ public class IdxBizUxfvDto   {
     @TableField("INDEX_ADDRESS")
     private String indexAddress;
 
+    private Double currentValue;
+
+    private String pointOneId;
+    private String pointTwoId;
+    private String pointThreeId;
+
+    private String analysVariableId;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxExplorerDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@ApiModel(value="IdxExplorerDto", description="")
+public class IdxExplorerDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    private String id;
+
+    @TableField("createDate")
+    private Date createDate;
+
+    private String creator;
+
+    @TableField("updateDate")
+    private Date updateDate;
+
+    private String updater;
+
+    @ApiModelProperty(value = "资源类型")
+    @TableField("agencyCode")
+    private String agencyCode;
+
+    @ApiModelProperty(value = "拓展字段")
+    private String extras;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "路径")
+    private String path;
+
+    @ApiModelProperty(value = "父ID")
+    private String pid;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "资源类型")
+    private String type;
+
+    @ApiModelProperty(value = "所属系统")
+    @TableField("sourceSystem")
+    private String sourceSystem;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBiz208l.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import java.time.LocalDateTime;
+
+import java.util.Date;
 
 
 /**
@@ -36,7 +37,7 @@ public class IdxBiz208l  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -96,13 +97,13 @@ public class IdxBiz208l  {
      * 
      */
 	@TableField("ANALYSIS_START_TIME")
-    private LocalDateTime analysisStartTime;
+    private Date analysisStartTime;
 
     /**
      *
      */
 	@TableField("ANALYSIS_END_TIME")
-    private LocalDateTime analysisEndTime;
+    private Date analysisEndTime;
 
     /**
      * 片区

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBiz3yud.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBiz3yud  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBiz59c8.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBiz59c8  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizAahn.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizAahn  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizBtlq.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizBtlq  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizC80c.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Data
 
 @Accessors(chain = true)
-@TableName(value = "idx_biz_c80c",autoResultMap = true)
+@TableName(value = "idx_biz_fan_point_var_correlation",autoResultMap = true)
 public class IdxBizC80c  {
 
     private static final long serialVersionUID = 1L;
@@ -69,13 +69,13 @@ public class IdxBizC80c  {
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     /**
      * 
      */
 	@TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     /**
      * 片区

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanHealthIndex.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+@Accessors(chain = true)
+@TableName("idx_biz_fan_health_index")
+public class IdxBizFanHealthIndex {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 分析维度类型
+     */
+	@TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    /**
+     * 分析维度seq
+     */
+	@TableField("ANALYSIS_OBJ_SEQ")
+    private Integer analysisObjSeq;
+
+    /**
+     * 
+     */
+	@TableField("WEIGTH")
+    private Double weigth;
+
+    /**
+     * 
+     */
+	@TableField("HEALTH_INDEX")
+    private Double healthIndex;
+
+    /**
+     * 健康等级
+     */
+	@TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_START_TIME")
+    private LocalDateTime analysisStartTime;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_END_TIME")
+    private LocalDateTime analysisEndTime;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子系统
+     */
+	@TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    /**
+     * 型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    /**
+     * 
+     */
+	@TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    /**
+     * 点表地址
+     */
+	@TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanHealthLevel.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_health_level")
+public class IdxBizFanHealthLevel{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 分析维度类型：【全域、区域、场站、设备、子系统、测点】
+     */
+	@TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    /**
+     * 健康等级：【安全、注意、警告、风险】
+     */
+	@TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    /**
+     * 
+     */
+	@TableField("GROUP_UPPER_LIMIT")
+    private Double groupUpperLimit;
+
+    /**
+     * 
+     */
+	@TableField("GROUP_LOWER_LIMIT")
+    private Double groupLowerLimit;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointProcessVariableClassification.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_point_process_variable_classification")
+public class IdxBizFanPointProcessVariableClassification{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private Date recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 工况区间值1
+     */
+	@TableField("INTERVAL_VALUE1")
+    private Double intervalValue1;
+
+    /**
+     * 工况区间值2
+     */
+	@TableField("INTERVAL_VALUE2")
+    private Double intervalValue2;
+
+    /**
+     * 工况区间值3
+     */
+	@TableField("INTERVAL_VALUE3")
+    private Double intervalValue3;
+
+    /**
+     * 工况区间值4
+     */
+	@TableField("INTERVAL_VALUE4")
+    private Double intervalValue4;
+
+    /**
+     * 工况区间值5
+     */
+	@TableField("INTERVAL_VALUE5")
+    private Double intervalValue5;
+
+    /**
+     * 标签
+     */
+	@TableField("TAG_CODE")
+    private String tagCode;
+
+    /**
+     * 设备型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 
+     */
+	@TableField("POINT_ID")
+    private Long pointId;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子系统
+     */
+	@TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    /**
+     * 测点
+     */
+	@TableField("POINT_NAME")
+    private String pointName;
+
+    /**
+     * 
+     */
+	@TableField("GATEWAY_ID")
+    private Long gatewayId;
+
+    /**
+     * 点表地址
+     */
+	@TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    /**
+     * KKS码
+     */
+	@TableField("KKS")
+    private String kks;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointTag.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_point_tag")
+public class IdxBizFanPointTag{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 标签
+     */
+	@TableField("TAG_CODE")
+    private String tagCode;
+
+    /**
+     * 测点
+     */
+	@TableField("POINT_NAME")
+    private String pointName;
+
+    /**
+     * 设备型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 厂站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 网关ID
+     */
+	@TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointVarCentralValue.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_point_var_central_value")
+public class IdxBizFanPointVarCentralValue{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_CENTER_VALUE")
+    private Double analysisCenterValue;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_STD_DEV")
+    private Double analysisStdDev;
+
+    /**
+     * 
+     */
+	@TableField("INTERVAL_COMBINATION")
+    private String intervalCombination;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子系统
+     */
+	@TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    /**
+     * 型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS_COMBINATION")
+    private String processCombination;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    /**
+     * 工况量1区间最小值
+     */
+	@TableField("PROCESS1_MIN")
+    private Double process1Min;
+
+    /**
+     * 工况量1区间最大值
+     */
+	@TableField("PROCESS1_MAX")
+    private Double process1Max;
+
+    /**
+     * 工况变量1ID
+     */
+	@TableField("PROCESS_POINT1_ID")
+    private String processPoint1Id;
+
+    /**
+     * 工况量2区间最小值
+     */
+	@TableField("PROCESS2_MIN")
+    private Double process2Min;
+
+    /**
+     * 工况量2区间最大值
+     */
+	@TableField("PORCESS2_MAX")
+    private Double porcess2Max;
+
+    /**
+     * 工况量3区间最大值
+     */
+	@TableField("PROCESS3_MAX")
+    private Double process3Max;
+
+    /**
+     * 工况量3区间最小值
+     */
+	@TableField("PROCESS3_MIN")
+    private Double process3Min;
+
+    /**
+     * 工况变量3ID
+     */
+	@TableField("PROCESS_POINT3_ID")
+    private String processPoint3Id;
+
+    /**
+     * 工况变量2ID
+     */
+	@TableField("PROCESS_POINT2_ID")
+    private Double processPoint2Id;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanPointVarCorrelation.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_point_var_correlation")
+public class IdxBizFanPointVarCorrelation{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private Date recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 
+     */
+	@TableField("CORRELATION_COEFFICIENT")
+    private Double correlationCoefficient;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Long analysisPointId;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS_POINT_ID")
+    private Long processPointId;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子系统
+     */
+	@TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    /**
+     * 型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_GATEWAY_ID")
+    private String analysisGatewayId;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_INDEX_ADDRESS")
+    private String analysisIndexAddress;
+
+    /**
+     * 网关ID
+     */
+	@TableField("PROCESS_GATEWAY_ID")
+    private String processGatewayId;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS_INDEX_ADDRESS")
+    private String processIndexAddress;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRecord.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_warning_record")
+public class IdxBizFanWarningRecord{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 处置状态
+     */
+	@TableField("DISPOSOTION_STATE")
+    private String disposotionState;
+
+    /**
+     * 
+     */
+	@TableField("HEALTH_INDEX_SEQ")
+    private Integer healthIndexSeq;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 预警等级
+     */
+	@TableField("WARNING_NAME")
+    private String warningName;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子系统
+     */
+	@TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    /**
+     * 型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 网关ID
+     */
+	@TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    /**
+     * 点表地址
+     */
+	@TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRuleSet.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_fan_warning_rule_set")
+public class IdxBizFanWarningRuleSet{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 预警判断条件
+     */
+	@TableField("WARNING_IF")
+    private String warningIf;
+
+    /**
+     * 预警判断连续周期
+     */
+	@TableField("WARNING_CYCLE")
+    private String warningCycle;
+
+    /**
+     * 预警名称（危险、警告、注意）
+     */
+	@TableField("WARNING_NAME")
+    private String warningName;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 分析周期((按天、10min、小时)
+     */
+	@TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子系统
+     */
+	@TableField("SUB_SYSTEM")
+    private String subSystem;
+
+    /**
+     * 型号
+     */
+	@TableField("NUMBER")
+    private String number;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFelk.java

@@ -40,7 +40,7 @@ public class IdxBizFelk {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -70,7 +70,7 @@ public class IdxBizFelk {
      * 分析维度seq
      */
 	@TableField("ANALYSIS_OBJ_SEQ")
-    private Integer analysisObjSeq;
+    private Long analysisObjSeq;
 
     /**
      * 
@@ -100,13 +100,14 @@ public class IdxBizFelk {
      * 
      */
 	@TableField("ANALYSIS_START_TIME")
-    private LocalDateTime analysisStartTime;
+    private Date analysisStartTime;
+
 
     /**
      * 
      */
 	@TableField("ANALYSIS_END_TIME")
-    private LocalDateTime analysisEndTime;
+    private Date analysisEndTime;
 
     /**
      * 片区

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizHjev.java

@@ -68,13 +68,13 @@ public class IdxBizHjev  {
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private Long analysisPointId;
 
     /**
      * 
      */
 	@TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private Long processPointId;
 
     /**
      * 片区

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizIegc.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizIegc  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizKsia.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizKsia  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizP2z9.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizP2z9  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPldo.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizPldo {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvHealthIndex.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_health_index")
+public class IdxBizPvHealthIndex{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 分析维度类型
+     */
+	@TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    /**
+     * 分析维度seq
+     */
+	@TableField("ANALYSIS_OBJ_SEQ")
+    private Integer analysisObjSeq;
+
+    /**
+     * 
+     */
+	@TableField("WEIGTH")
+    private Double weigth;
+
+    /**
+     * 
+     */
+	@TableField("HEALTH_INDEX")
+    private Double healthIndex;
+
+    /**
+     * 健康等级
+     */
+	@TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    /**
+     * 分析周期
+     */
+	@TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_START_TIME")
+    private LocalDateTime analysisStartTime;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_END_TIME")
+    private LocalDateTime analysisEndTime;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子阵
+     */
+	@TableField("SUBARRAY")
+    private String subarray;
+
+    /**
+     * 厂商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 网关ID
+     */
+	@TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    /**
+     * 点表地址
+     */
+	@TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvHealthLevel.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_health_level")
+public class IdxBizPvHealthLevel{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 分析维度类型：【全域、区域、场站、设备、子系统、测点】
+     */
+	@TableField("ANALYSIS_OBJ_TYPE")
+    private String analysisObjType;
+
+    /**
+     * 健康等级：【安全、注意、警告、风险】
+     */
+	@TableField("HEALTH_LEVEL")
+    private String healthLevel;
+
+    /**
+     * 
+     */
+	@TableField("GROUP_UPPER_LIMIT")
+    private Double groupUpperLimit;
+
+    /**
+     * 
+     */
+	@TableField("GROUP_LOWER_LIMIT")
+    private Double groupLowerLimit;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointProcessVariableClassification.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_point_process_variable_classification")
+public class IdxBizPvPointProcessVariableClassification{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private Date recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 工况区间值1
+     */
+	@TableField("INTERVAL_VALUE1")
+    private Integer intervalValue1;
+
+    /**
+     * 工况区间值2
+     */
+	@TableField("INTERVAL_VALUE2")
+    private Integer intervalValue2;
+
+    /**
+     * 工况区间值3
+     */
+	@TableField("INTERVAL_VALUE3")
+    private Integer intervalValue3;
+
+    /**
+     * 工况区间值4
+     */
+	@TableField("INTERVAL_VALUE4")
+    private Integer intervalValue4;
+
+    /**
+     * 工况区间值5
+     */
+	@TableField("INTERVAL_VALUE5")
+    private Integer intervalValue5;
+
+    /**
+     * 标签
+     */
+	@TableField("TAG_CODE")
+    private String tagCode;
+
+    /**
+     * 
+     */
+	@TableField("POINT_ID")
+    private Integer pointId;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    /**
+     * 厂商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 子阵
+     */
+	@TableField("SUBARRAY")
+    private String subarray;
+
+    /**
+     * 
+     */
+	@TableField("GATEWAY_ID")
+    private Long gatewayId;
+
+    /**
+     * 点表地址
+     */
+	@TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    /**
+     * KKS码
+     */
+	@TableField("KKS")
+    private String kks;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointTag.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_point_tag")
+public class IdxBizPvPointTag{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 标签
+     */
+	@TableField("TAG_CODE")
+    private String tagCode;
+
+    /**
+     * 网关ID
+     */
+	@TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    /**
+     * 测点
+     */
+	@TableField("POINT_NAME")
+    private String pointName;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 厂站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 厂商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_point_var_central_value")
+public class IdxBizPvPointVarCentralValue{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_CENTER_VALUE")
+    private Double analysisCenterValue;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_STD_DEV")
+    private Double analysisStdDev;
+
+    /**
+     * 
+     */
+	@TableField("INTERVAL_COMBINATION")
+    private String intervalCombination;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子阵
+     */
+	@TableField("SUBARRAY")
+    private String subarray;
+
+    /**
+     * 产商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS_COMBINATION")
+    private String processCombination;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS2_MIN")
+    private Double process2Min;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS2_MAX")
+    private Double process2Max;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS3_MIN")
+    private Double process3Min;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS3_MAX")
+    private Double process3Max;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCorrelation.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_point_var_correlation")
+public class IdxBizPvPointVarCorrelation{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private Date recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 
+     */
+	@TableField("CORRELATION_COEFFICIENT")
+    private Double correlationCoefficient;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS_POINT_ID")
+    private Integer processPointId;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子阵
+     */
+	@TableField("SUBARRAY")
+    private String subarray;
+
+    /**
+     * 厂商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 网关ID
+     */
+	@TableField("ANALYSIS_GATEWAY_ID")
+    private String analysisGatewayId;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_INDEX_ADDRESS")
+    private Integer analysisIndexAddress;
+
+    /**
+     * 网关ID
+     */
+	@TableField("PROCESS_GATEWAY_ID")
+    private String processGatewayId;
+
+    /**
+     * 
+     */
+	@TableField("PROCESS_INDEX_ADDRESS")
+    private Integer processIndexAddress;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRecord.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_warning_record")
+public class IdxBizPvWarningRecord{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 处置状态
+     */
+	@TableField("DISPOSOTION_STATE")
+    private String disposotionState;
+
+    /**
+     * 
+     */
+	@TableField("HEALTH_INDEX_SEQ")
+    private Integer healthIndexSeq;
+
+    /**
+     * 
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 预警等级
+     */
+	@TableField("WARNING_NAME")
+    private String warningName;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 子阵
+     */
+	@TableField("SUBARRAY")
+    private String subarray;
+
+    /**
+     * 产商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+    /**
+     * 网关ID
+     */
+	@TableField("GATEWAY_ID")
+    private Integer gatewayId;
+
+    /**
+     * 点表地址
+     */
+	@TableField("INDEX_ADDRESS")
+    private String indexAddress;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWarningRuleSet.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_biz_pv_warning_rule_set")
+public class IdxBizPvWarningRuleSet{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("SEQUENCE_NBR")
+    private String sequenceNbr;
+
+    /**
+     * 
+     */
+	@TableField("RECORD")
+    private String record;
+
+    /**
+     * 
+     */
+	@TableField("REC_DATE")
+    private LocalDateTime recDate;
+
+    /**
+     * 
+     */
+	@TableField("REC_USER_ID")
+    private String recUserId;
+
+    /**
+     * 
+     */
+	@TableField("INSTANCE_ID")
+    private String instanceId;
+
+    /**
+     * 
+     */
+	@TableField("STATUS")
+    private String status;
+
+    /**
+     * 预警判断条件
+     */
+	@TableField("WARNING_IF")
+    private String warningIf;
+
+    /**
+     * 预警判断连续周期
+     */
+	@TableField("WARNING_CYCLE")
+    private String warningCycle;
+
+    /**
+     * 预警名称（危险、警告、注意）
+     */
+	@TableField("WARNING_NAME")
+    private String warningName;
+
+    /**
+     * 分析变量测点ID
+     */
+	@TableField("ANALYSIS_POINT_ID")
+    private Integer analysisPointId;
+
+    /**
+     * 分析周期((按天、10min、小时)
+     */
+	@TableField("ANALYSIS_TYPE")
+    private String analysisType;
+
+    /**
+     * 片区
+     */
+	@TableField("ARAE")
+    private String arae;
+
+    /**
+     * 场站
+     */
+	@TableField("STATION")
+    private String station;
+
+    /**
+     * 设备名称
+     */
+	@TableField("EQUIPMENT_NAME")
+    private String equipmentName;
+
+    /**
+     * 子阵
+     */
+	@TableField("SUBARRAY")
+    private String subarray;
+
+    /**
+     * 厂商
+     */
+	@TableField("MANUFACTURER")
+    private String manufacturer;
+
+    /**
+     * 设备类型
+     */
+	@TableField("DEVICE_TYPE")
+    private String deviceType;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizUhef.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -18,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName(value = "idx_biz_uhef",autoResultMap = true)
+@TableName(value = "idx_biz_fan_point_var_central_value",autoResultMap = true)
 public class IdxBizUhef  {
 
     private static final long serialVersionUID = 1L;
@@ -39,7 +38,7 @@ public class IdxBizUhef  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -120,6 +119,18 @@ public class IdxBizUhef  {
     private String processCombination;
 
     /**
+     * 工况变量1最小值
+     */
+    @TableField("PROCESS1_MIN")
+    private Double process1Min;
+
+    /**
+     * 工况变量1最大值
+     */
+    @TableField("PROCESS1_MAX")
+    private Double process1Max;
+
+    /**
      * 工况变量2最小值
      */
 	@TableField("PROCESS2_MIN")
@@ -143,4 +154,11 @@ public class IdxBizUhef  {
 	@TableField("PROCESS3_MAX")
     private Double process3Max;
 
+    @TableField("PROCESS_POINT1_ID")
+    private String pointOneId;
+    @TableField("PROCESS_POINT2_ID")
+    private String pointTwoId;
+    @TableField("PROCESS_POINT3_ID")
+    private String pointThreeId;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizUxfv.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -18,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName(value = "idx_biz_uxfv",autoResultMap = true)
+@TableName(value = "idx_biz_fan_point_process_variable_classification",autoResultMap = true)
 public class IdxBizUxfv  {
 
     private static final long serialVersionUID = 1L;
@@ -39,7 +38,7 @@ public class IdxBizUxfv  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizYh88.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizYh88  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizZrdb.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -39,7 +38,7 @@ public class IdxBizZrdb  {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxExplorer.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("idx_explorer")
+public class IdxExplorer{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@TableField("id")
+    private String id;
+
+    /**
+     * 
+     */
+	@TableField("createDate")
+    private Date createDate;
+
+    /**
+     * 
+     */
+	@TableField("creator")
+    private String creator;
+
+    /**
+     * 
+     */
+	@TableField("updateDate")
+    private Date updateDate;
+
+    /**
+     * 
+     */
+	@TableField("updater")
+    private String updater;
+
+    /**
+     * 资源类型
+     */
+	@TableField("agencyCode")
+    private String agencyCode;
+
+    /**
+     * 拓展字段
+     */
+	@TableField("extras")
+    private String extras;
+
+    /**
+     * 名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 路径
+     */
+	@TableField("path")
+    private String path;
+
+    /**
+     * 父ID
+     */
+	@TableField("pid")
+    private String pid;
+
+    /**
+     * 排序
+     */
+	@TableField("sort")
+    private Integer sort;
+
+    /**
+     * 资源类型
+     */
+	@TableField("type")
+    private String type;
+
+    /**
+     * 所属系统
+     */
+	@TableField("sourceSystem")
+    private String sourceSystem;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIndex> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthLevelMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanHealthLevelMapper extends BaseMapper<IdxBizFanHealthLevel> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanPointProcessVariableClassificationMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanPointProcessVariableClassificationMapper extends BaseMapper<IdxBizFanPointProcessVariableClassification> {
+    List<IdxBizFanPointProcessVariableClassification> getInfluxDBData();
+
+    List<String> gateWayIdListFan();
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanPointTagMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointTag;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanPointTagMapper extends BaseMapper<IdxBizFanPointTag> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanPointVarCentralValueMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointVarCentralValue;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanPointVarCentralValueMapper extends BaseMapper<IdxBizFanPointVarCentralValue> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanPointVarCorrelationMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointVarCorrelation;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanPointVarCorrelationMapper extends BaseMapper<IdxBizFanPointVarCorrelation> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanWarningRecordMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanWarningRecordMapper extends BaseMapper<IdxBizFanWarningRecord> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanWarningRuleSetMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRuleSet;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizFanWarningRuleSetMapper extends BaseMapper<IdxBizFanWarningRuleSet> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvHealthIndexMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvHealthIndexMapper extends BaseMapper<IdxBizPvHealthIndex> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvHealthLevelMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthLevel;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvHealthLevelMapper extends BaseMapper<IdxBizPvHealthLevel> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvPointProcessVariableClassificationMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointProcessVariableClassification;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvPointProcessVariableClassificationMapper extends BaseMapper<IdxBizPvPointProcessVariableClassification> {
+    List<String> gateWayIdListPv();
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvPointTagMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointTag;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvPointTagMapper extends BaseMapper<IdxBizPvPointTag> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvPointVarCentralValueMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointVarCentralValue;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvPointVarCentralValueMapper extends BaseMapper<IdxBizPvPointVarCentralValue> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvPointVarCorrelationMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointVarCorrelation;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvPointVarCorrelationMapper extends BaseMapper<IdxBizPvPointVarCorrelation> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvWarningRecordMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvWarningRecordMapper extends BaseMapper<IdxBizPvWarningRecord> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvWarningRuleSetMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRuleSet;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxBizPvWarningRuleSetMapper extends BaseMapper<IdxBizPvWarningRuleSet> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizUhefMapper.java

 package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUhefDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUhef;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  Mapper 接口
  *
@@ -11,4 +15,5 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUhef;
  */
 public interface IdxBizUhefMapper extends BaseMapper<IdxBizUhef> {
 
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizUxfvMapper.java

 package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUhefDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUxfvDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUxfv;
 
+import java.util.List;
+
 /**
  *  Mapper 接口
  *
@@ -11,4 +15,8 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUxfv;
  */
 public interface IdxBizUxfvMapper extends BaseMapper<IdxBizUxfv> {
 
+    List<IdxBizUxfvDto> getInfluxDBData();
+
+    List<String> gateWayIdListFan();
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxExplorerMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxExplorer;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IdxExplorerMapper extends BaseMapper<IdxExplorer> {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanHealthIndexService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanHealthLevelService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanPointProcessVariableClassificationService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanPointTagService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanPointVarCentralValueService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanPointVarCorrelationService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanWarningRecordService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizFanWarningRuleSetService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvHealthIndexService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvHealthLevelService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvPointProcessVariableClassificationService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvPointTagService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvPointVarCentralValueService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvPointVarCorrelationService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvWarningRecordService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxBizPvWarningRuleSetService {
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+public interface IIdxExplorerService {
+
+}

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizC80c;
-import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizHjev;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizC80cMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizHjevMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
 import com.yeejoin.amos.component.influxdb.InfluxdbUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.springframework.util.ObjectUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
-import java.util.ArrayList;
-import java.util.List;
 @Service
 public class CommonServiceImpl {
+    //utc时间格式
+    public static final String FORMAT_UTC = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+    private static final Logger logger = LoggerFactory.getLogger(CommonServiceImpl.class);
+    //-----------------调用算法时间间隔----------------
+    @Value("${sleep.time:10}")
+    Integer sleepTime;
+    @Value("${base.url:http://36.40.66.175:30009/maas/maas/processes/api/}")
+    String baseUrl;
+    //----------------工况变量工况变量划分请求属性配置------------------------
+    @Value("${gkblhf.url:e884fccf-b7ac-4fa4-bdb7-a5b6ff7319ec}")
+    String gkqjhfurl;
+    @Value("${gkblhf.key:input 1}")
+    String gkqjhfkey;
+    //----------------工况变量相关性计算请求属性配置------------------------
+    @Value("${gkxgxfx.url:f5457bfe-0780-418d-9287-c4f31d3fb4c7}")
+    String gkxgxfxurl;
+    @Value("${gkxgxfx.key:input 1}")
+    String gkxgxfxkey;
+    //----------------工况变量中心值计算相关请求属性配置------------------------
+    @Value("${gkzxzjs.url:ee855fc0-cb37-4b11-96c6-e61e195436bc}")
+    String gkzxzjsurl;
+    @Value("${gkzxzjs.key:input 1}")
+    String gkzxzjskey1;
+
+    @Value("${gkzxzjs.key:input 2}")
+    String gkzxzjskey2;
+
+    //    {"tableName": "idx_biz_fan_point_process_variable_classification"} 风机工况变量划分
+    //    {"tableName": "idx_biz_pv_point_process_variable_classification"}  光伏工况变量画分
+    //    {"tableName": "idx_biz_fan_point_var_correlation"} 风机相关性
+    //    {"tableName": "idx_biz_pv_point_var_correlation"} 光伏相关性
     @Autowired
-    private IdxBizC80cMapper idxBizC80cMapper;
+    private IdxBizFanPointProcessVariableClassificationMapper idxBizFanPointProcessVariableClassificationMapper;
     @Autowired
-    private IdxBizHjevMapper idxBizHjevMapper;
-
+    private IdxBizPvPointProcessVariableClassificationMapper idxBizPvPointProcessVariableClassificationMapper;
     @Autowired
-    InfluxdbUtil influxdbUtil;
-
-    public List<IdxBizC80c> getAllFanstationTestPoint(){
-        List<IdxBizC80c> idxBizC80cList = new ArrayList<>();
-        idxBizC80cList = idxBizC80cMapper.selectList(new QueryWrapper<IdxBizC80c>().isNotNull("SEQUENCE_NBR"));
-        return idxBizC80cList;
-    }
-    public List<IdxBizHjev> getAllPVstationTestPoint(){
-        List<IdxBizHjev> idxBizC80cList = new ArrayList<>();
-        idxBizC80cList = idxBizHjevMapper.selectList(new QueryWrapper<IdxBizHjev>().isNotNull("SEQUENCE_NBR"));
-        return idxBizC80cList;
-    }
-     public List<String> getGateWayId(){
-        List<String> gateWayIdList=idxBizC80cMapper.gateWayIdListFan();
-        return gateWayIdList;
-     }
- }
+    private IdxBizFanPointVarCorrelationMapper idxBizFanPointVarCorrelationMapper;
+    @Autowired
+    private IdxBizPvPointVarCorrelationMapper idxBizPvPointVarCorrelationMapper;
+    @Autowired
+    private InfluxdbUtil influxdbUtil;
+
+
+    /**
+     * @return
+     * @deprecated 获取工况变量列表风机
+     */
+    public HashMap<String, List<IdxBizFanPointProcessVariableClassification>> getIdxBizFanPointProcessVariableClassificationList() {
+
+        HashMap<String, List<IdxBizFanPointProcessVariableClassification>> idxBizFanPointProcessVariableClassification = new HashMap<>();
+        List<String> gateWayIdList = idxBizFanPointProcessVariableClassificationMapper.gateWayIdListFan();
+        List<IdxBizFanPointProcessVariableClassification> IdxBizFanPointProcessVariableClassificationList = idxBizFanPointProcessVariableClassificationMapper.selectList(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().isNotNull("SEQUENCE_NBR").eq("TAG_CODE", "工况变量"));
+        List<IdxBizFanPointProcessVariableClassification> finalIdxBizFanPointProcessVariableClassificationList = IdxBizFanPointProcessVariableClassificationList;
+        gateWayIdList.forEach(s -> {
+            idxBizFanPointProcessVariableClassification.put("iot_data_" + s, finalIdxBizFanPointProcessVariableClassificationList.stream().filter(idxBizFanPointProcessVariableClassification1 -> idxBizFanPointProcessVariableClassification1.getGatewayId().toString().equals(s)).collect(Collectors.toList()));
+        });
+        return idxBizFanPointProcessVariableClassification;
+    }
+
+    /**
+     * @return
+     * @deprecated 获取工况变量列表光伏
+     */
+    public HashMap<String, List<IdxBizPvPointProcessVariableClassification>> getIdxBizPvPointProcessVariableClassificationList() {
+
+        HashMap<String, List<IdxBizPvPointProcessVariableClassification>> idxBizPvPointProcessVariableClassificationHashMap = new HashMap<>();
+        List<String> gateWayIdList = idxBizPvPointProcessVariableClassificationMapper.gateWayIdListPv();
+        List<IdxBizPvPointProcessVariableClassification> idxBizPvPointProcessVariableClassificationList = idxBizPvPointProcessVariableClassificationMapper.selectList(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().isNotNull("SEQUENCE_NBR").eq("TAG_CODE", "工况变量"));
+        List<IdxBizPvPointProcessVariableClassification> finalIdxBizPvPointProcessVariableClassificationList = idxBizPvPointProcessVariableClassificationList;
+        gateWayIdList.forEach(s -> {
+            idxBizPvPointProcessVariableClassificationHashMap.put("iot_data_" + s, finalIdxBizPvPointProcessVariableClassificationList.stream().filter(idxBizFanPointProcessVariableClassification -> idxBizFanPointProcessVariableClassification.getGatewayId().toString().equals(s)).collect(Collectors.toList()));
+        });
+        return idxBizPvPointProcessVariableClassificationHashMap;
+    }
+
+    //遍历工况列表数据-风机
+    public void getFanConditionVariablesByTime(String startTime, String endTime) {
+        HashMap<String, List<IdxBizFanPointProcessVariableClassification>> idxBizFanPointProcessVariableClassificationHashMap = getIdxBizFanPointProcessVariableClassificationList();
+        idxBizFanPointProcessVariableClassificationHashMap.keySet().forEach(s -> {
+            List<IdxBizFanPointProcessVariableClassification> list = idxBizFanPointProcessVariableClassificationHashMap.get(s);
+            if (list.size() > 0) {
+                foreachHandlerConditionVariabFan(s, list, startTime, endTime);
+            }
+        });
+    }
+
+    //遍历工况列表数据-光伏
+    public void getPvConditionVariablesByTime(String startTime, String endTime) {
+        HashMap<String, List<IdxBizPvPointProcessVariableClassification>> idxBizPvPointProcessVariableClassificationHashMap = getIdxBizPvPointProcessVariableClassificationList();
+        idxBizPvPointProcessVariableClassificationHashMap.keySet().forEach(s -> {
+            List<IdxBizPvPointProcessVariableClassification> list = idxBizPvPointProcessVariableClassificationHashMap.get(s);
+            if (list.size() > 0) {
+                foreachHandlerConditionVariabPv(s, list, startTime, endTime);
+            }
+        });
+    }
+
+    //遍历查询数据并调用并计算-风机
+    public void foreachHandlerConditionVariabFan(String tableName, List<IdxBizFanPointProcessVariableClassification> list, String startTime, String endTime) {
+        list.forEach(idxBizFanPointProcessVariableClassification -> {
+            logger.info("--------------------------------------------风机：：开始查询influxdb--------------------------------");
+            List<Map<String, Object>> params = new ArrayList<>();
+//            String sql = String.format("select value from %s where address='%s' and where time >= '%s' and where time <= '%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+            String sql = String.format("select value from %s where address='%s' ", tableName, idxBizFanPointProcessVariableClassification.getIndexAddress());
+            List<Map<String, Object>> returnList = influxdbUtil.query(sql);
+            returnList.forEach((k) -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("processVariable", Double.parseDouble(k.get("value").toString()));
+                map.put("processVariableId", Long.parseLong(idxBizFanPointProcessVariableClassification.getSequenceNbr()));
+                params.add(map);
+            });
+            if (!params.isEmpty()) {
+                logger.info("------------------------------------------风机：：开始调用工况变量区间划分算法----------------------------------------");
+                HashMap<String, Object> realParams = new HashMap<>();
+                realParams.put(gkqjhfkey, params);
+                String reponse = HttpUtil.createPost(baseUrl + gkqjhfurl).body(JSON.toJSONString(realParams)).execute().body();
+                try {
+                    logger.info(reponse);
+                    TimeUnit.SECONDS.sleep(sleepTime);
+                    logger.info("------------------------------------------风机：：调用工况变量区间划分算法结束----------------------------------------");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+    }
+
+    //遍历查询数据并调用并计算-光伏
+    public void foreachHandlerConditionVariabPv(String tableName, List<IdxBizPvPointProcessVariableClassification> list, String startTime, String endTime) {
+        list.forEach(idxBizPvPointProcessVariableClassification -> {
+            logger.info("--------------------------------------------光伏：：开始查询influxdb--------------------------------");
+            List<Map<String, Object>> params = new ArrayList<>();
+//            String sql = String.format("select value from %s where address='%s' and where time >= '%s' and where time <= '%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+            String sql = String.format("select value from %s where address='%s' ", tableName, idxBizPvPointProcessVariableClassification.getIndexAddress());
+            List<Map<String, Object>> returnList = influxdbUtil.query(sql);
+            returnList.forEach((k) -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("processVariable", Double.parseDouble(k.get("value").toString()));
+                map.put("processVariableId", Long.parseLong(idxBizPvPointProcessVariableClassification.getSequenceNbr()));
+                params.add(map);
+            });
+            if (!params.isEmpty()) {
+                logger.info("------------------------------------------光伏：：开始调用工况变量区间划分算法----------------------------------------");
+                HashMap<String, Object> realParams = new HashMap<>();
+                realParams.put(gkqjhfkey, params);
+                String reponse = HttpUtil.createPost(baseUrl + gkqjhfurl).body(JSON.toJSONString(realParams)).execute().body();
+                try {
+                    logger.info(reponse);
+                    TimeUnit.SECONDS.sleep(sleepTime);
+                    logger.info("------------------------------------------光伏：：调用工况变量区间划分算法结束----------------------------------------");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+
+    }
+
+    //获取相关性基础数据-风机
+    public HashMap<String, List<IdxBizFanPointProcessVariableClassification>> getIdxBizFanPointProcessVariableClassificationListOfAnaLyse() {
+
+        HashMap<String, List<IdxBizFanPointProcessVariableClassification>> IdxBizFanPointProcessVariableClassificationHashMap = new HashMap<>();
+        List<String> gateWayIdList = idxBizFanPointProcessVariableClassificationMapper.gateWayIdListFan();
+        List<IdxBizFanPointProcessVariableClassification> IdxBizFanPointProcessVariableClassificationListFengxi = idxBizFanPointProcessVariableClassificationMapper.selectList(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().isNotNull("SEQUENCE_NBR").eq("TAG_CODE", "分析变量"));
+        List<IdxBizFanPointProcessVariableClassification> finalIdxBizFanPointProcessVariableClassificationList = IdxBizFanPointProcessVariableClassificationListFengxi;
+        gateWayIdList.forEach(s -> {
+            IdxBizFanPointProcessVariableClassificationHashMap.put("iot_data_" + s, finalIdxBizFanPointProcessVariableClassificationList.stream().filter(IdxBizFanPointProcessVariableClassification -> IdxBizFanPointProcessVariableClassification.getGatewayId().toString().equals(s)).collect(Collectors.toList()));
+        });
+        return IdxBizFanPointProcessVariableClassificationHashMap;
+    }
+
+    //获取相关性基础数据-光伏
+    public HashMap<String, List<IdxBizPvPointProcessVariableClassification>> getIdxBizPvPointProcessVariableClassificationListOfAnaLyse() {
+
+        HashMap<String, List<IdxBizPvPointProcessVariableClassification>> idxBizPvPointProcessVariableClassificationHashMap = new HashMap<>();
+        List<String> gateWayIdList = idxBizPvPointProcessVariableClassificationMapper.gateWayIdListPv();
+        List<IdxBizPvPointProcessVariableClassification> idxBizPvPointProcessVariableClassificationListFengxi = idxBizPvPointProcessVariableClassificationMapper.selectList(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().isNotNull("SEQUENCE_NBR").eq("TAG_CODE", "分析变量"));
+        List<IdxBizPvPointProcessVariableClassification> finalIdxBizPvPointProcessVariableClassificationList = idxBizPvPointProcessVariableClassificationListFengxi;
+        gateWayIdList.forEach(s -> {
+            idxBizPvPointProcessVariableClassificationHashMap.put("iot_data_" + s, finalIdxBizPvPointProcessVariableClassificationList.stream().filter(idxBizPvPointProcessVariableClassification -> idxBizPvPointProcessVariableClassification.getGatewayId().toString().equals(s)).collect(Collectors.toList()));
+        });
+        return idxBizPvPointProcessVariableClassificationHashMap;
+    }
+
+    //相关性分析-风机入口
+    public void getFanConditionVariablesByTimeAnalyse(String startTime, String endTime) {
+        HashMap<String, List<IdxBizFanPointProcessVariableClassification>> idxBizFanPointProcessVariableClassificationHashMap = getIdxBizFanPointProcessVariableClassificationListOfAnaLyse();
+        idxBizFanPointProcessVariableClassificationHashMap.keySet().forEach(s -> {
+            List<IdxBizFanPointProcessVariableClassification> list = idxBizFanPointProcessVariableClassificationHashMap.get(s);
+            list.forEach(IdxBizFanPointProcessVariableClassification -> {
+                List<IdxBizFanPointVarCorrelation> gongkuangList = idxBizFanPointVarCorrelationMapper.selectList(new QueryWrapper<IdxBizFanPointVarCorrelation>().eq("ANALYSIS_GATEWAY_ID", IdxBizFanPointProcessVariableClassification.getGatewayId()).eq("ANALYSIS_POINT_ID", IdxBizFanPointProcessVariableClassification.getSequenceNbr()));
+                if (gongkuangList.size() > 0) {
+                    foreachHandlerConditionVariabAnalyseFan(s, gongkuangList, startTime, endTime, IdxBizFanPointProcessVariableClassification);
+                }
+            });
+        });
+    }
+
+    //相关性分析-光伏入口
+    public void getPvConditionVariablesByTimeAnalyse(String startTime, String endTime) {
+        HashMap<String, List<IdxBizPvPointProcessVariableClassification>> idxBizPvPointProcessVariableClassificationHashMap = getIdxBizPvPointProcessVariableClassificationListOfAnaLyse();
+        idxBizPvPointProcessVariableClassificationHashMap.keySet().forEach(s -> {
+            List<IdxBizPvPointProcessVariableClassification> list = idxBizPvPointProcessVariableClassificationHashMap.get(s);
+            list.forEach(idxBizPvPointProcessVariableClassification -> {
+                List<IdxBizPvPointVarCorrelation> gongkuangList = idxBizPvPointVarCorrelationMapper.selectList(new QueryWrapper<IdxBizPvPointVarCorrelation>().eq("ANALYSIS_GATEWAY_ID", idxBizPvPointProcessVariableClassification.getGatewayId()).eq("ANALYSIS_POINT_ID", idxBizPvPointProcessVariableClassification.getSequenceNbr()));
+                if (gongkuangList.size() > 0) {
+                    foreachHandlerConditionVariabAnalysePv(s, gongkuangList, startTime, endTime, idxBizPvPointProcessVariableClassification);
+                }
+            });
+        });
+    }
+
+    //遍历处理数据-组装风机
+    public void foreachHandlerConditionVariabAnalyseFan(String tableName, List<IdxBizFanPointVarCorrelation> list, String startTime, String endTime, IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification) {
+        String sql1 = String.format("select value from %s where address='%s' ", tableName, idxBizFanPointProcessVariableClassification.getIndexAddress());
+        List<Map<String, Object>> returnList = influxdbUtil.query(sql1);
+        List<Map<String, Object>> params = new ArrayList<>();
+        returnList.forEach((k) -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("analysisVariable", Double.parseDouble(k.get("value").toString()));
+            map.put("analysisVariableId", Long.parseLong(idxBizFanPointProcessVariableClassification.getSequenceNbr()));
+            params.add(map);
+        });
+        List<Map<String, Object>> tempParams = params;
+        list.forEach(idxBizFanPointVarCorrelation -> {
+            logger.info("---------------------------------风机相关性-----------开始查询influxdb--------------------------------");
+            List<Map<String, Object>> params1 = new ArrayList<>();
+            List<Map<String, Object>> requestParams = new ArrayList<>();
+//            String sql = String.format("select value from %s where address='%s' and where time >= '%s' and where time <= '%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+            String sql = String.format("select value from %s where address='%s' ", tableName, idxBizFanPointVarCorrelation.getProcessIndexAddress());
+            List<Map<String, Object>> returnList1 = influxdbUtil.query(sql);
+            returnList.forEach((k) -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("processVariable", Double.parseDouble(k.get("value").toString()));
+                map.put("processVariableId", Long.parseLong(idxBizFanPointVarCorrelation.getProcessPointId().toString()));
+                params1.add(map);
+            });
+
+            if (tempParams.size() >= params1.size()) {
+                requestParams = megreMapList(tempParams, params1);
+            } else {
+                requestParams = megreMapList(params1, tempParams);
+            }
+            if (!requestParams.isEmpty()) {
+                logger.info("------------------------------风机相关性------------分析变量与工况变量相关性分析算法开始----------------------------------------");
+                HashMap<String, Object> realParams = new HashMap<>();
+                realParams.put(gkxgxfxkey, requestParams);
+                logger.info("------------------------------风机相关性------------分析变量与工况变量相关性分析算参数---------------------------------------" + JSON.toJSONString(realParams));
+                String repsonse = HttpUtil.createPost(baseUrl + gkxgxfxurl).body(JSON.toJSONString(realParams)).execute().body();
+                try {
+                    logger.info("response-------------" + repsonse);
+                    TimeUnit.SECONDS.sleep(sleepTime);
+                    logger.info("----------------------------风机相关性--------------分析变量与工况变量相关性分析算法结束----------------------------------------");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+    }
+
+    //遍历处理数据-组装风机
+    public void foreachHandlerConditionVariabAnalysePv(String tableName, List<IdxBizPvPointVarCorrelation> list, String startTime, String endTime, IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification) {
+        String sql1 = String.format("select value from %s where address='%s' ", tableName, idxBizPvPointProcessVariableClassification.getIndexAddress());
+        List<Map<String, Object>> returnList = influxdbUtil.query(sql1);
+        List<Map<String, Object>> params = new ArrayList<>();
+        returnList.forEach((k) -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("analysisVariable", Double.parseDouble(k.get("value").toString()));
+            map.put("analysisVariableId", Long.parseLong(idxBizPvPointProcessVariableClassification.getSequenceNbr()));
+            params.add(map);
+        });
+        list.forEach(idxBizPvPointVarCorrelation -> {
+            logger.info("-------------------------------------光伏相关性-------开始查询influxdb--------------------------------");
+            List<Map<String, Object>> params1 = new ArrayList<>();
+            List<Map<String, Object>> requestParams = new ArrayList<>();
+//            String sql = String.format("select value from %s where address='%s' and where time >= '%s' and where time <= '%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+            String sql = String.format("select value from %s where address='%s' ", tableName, idxBizPvPointVarCorrelation.getProcessIndexAddress());
+            List<Map<String, Object>> returnList1 = influxdbUtil.query(sql);
+            returnList.forEach((k) -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("processVariable", Double.parseDouble(k.get("value").toString()));
+                map.put("processVariableId", Long.parseLong(idxBizPvPointVarCorrelation.getProcessPointId().toString()));
+                params1.add(map);
+            });
+            if (params.size() >= params1.size()) {
+                requestParams = megreMapList(params, params1);
+            } else {
+                requestParams = megreMapList(params1, params);
+            }
+            if (!requestParams.isEmpty()) {
+                logger.info("---------------------------------光伏相关性---------分析变量与工况变量相关性分析算法开始----------------------------------------");
+                HashMap<String, Object> realParams = new HashMap<>();
+                realParams.put(gkxgxfxkey, requestParams);
+                String repsonse = HttpUtil.createPost(baseUrl + gkxgxfxurl).body(JSON.toJSONString(realParams)).execute().body();
+                try {
+                    logger.info("response----光伏相关性---------" + repsonse);
+                    TimeUnit.SECONDS.sleep(sleepTime);
+                    logger.info("----------------------------------光伏相关性--------分析变量与工况变量相关性分析算法结束----------------------------------------");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+    }
+
+    public List<Map<String, Object>> megreMapList(List<Map<String, Object>> longList, List<Map<String, Object>> shortList) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (int i = 0; i < longList.size(); i++) {
+            Map<String, Object> map = new HashMap<>();
+            map.putAll(longList.get(i));
+            Map<String, Object> mapOfShortList = new HashMap<>();
+            if (i < shortList.size() - 1) {
+                mapOfShortList.putAll(shortList.get(i));
+            } else {
+                mapOfShortList.putAll(shortList.get(shortList.size() - 1));
+            }
+
+            if (!map.containsKey("processVariable")) {
+                map.put("processVariable", mapOfShortList.get("processVariable"));
+                map.put("processVariableId", mapOfShortList.get("processVariableId"));
+            } else {
+                map.put("analysisVariable", mapOfShortList.get("analysisVariable"));
+                map.put("analysisVariableId", mapOfShortList.get("analysisVariableId"));
+            }
+            resultList.add(map);
+        }
+        return resultList;
+    }
+
+    //中心值计算-风电
+    public void getFanConditionVariablesByTimeAnalyse1(String startTime, String endTime) {
+        HashMap<String, List<IdxBizFanPointProcessVariableClassification>> IdxBizFanPointProcessVariableClassificationHashMap = getIdxBizFanPointProcessVariableClassificationListOfAnaLyse();
+        IdxBizFanPointProcessVariableClassificationHashMap.keySet().forEach(s -> {
+            List<IdxBizFanPointProcessVariableClassification> list = IdxBizFanPointProcessVariableClassificationHashMap.get(s);
+            list.forEach(IdxBizFanPointProcessVariableClassification -> {
+                List<IdxBizFanPointVarCorrelation> gongkuangList = idxBizFanPointVarCorrelationMapper.selectList(new QueryWrapper<IdxBizFanPointVarCorrelation>().eq("ANALYSIS_GATEWAY_ID", IdxBizFanPointProcessVariableClassification.getGatewayId()).eq("ANALYSIS_POINT_ID", IdxBizFanPointProcessVariableClassification.getSequenceNbr()).orderByDesc("CORRELATION_COEFFICIENT").last("limit 0,3"));
+                if (gongkuangList.size() > 0) {
+                    foreachHandlerConditionVariabAnalyse1Fan(s, gongkuangList, startTime, endTime, IdxBizFanPointProcessVariableClassification);
+                }
+            });
+        });
+    }
+
+    //中心值计算-光伏
+    public void getPvConditionVariablesByTimeAnalyse1(String startTime, String endTime) {
+        HashMap<String, List<IdxBizPvPointProcessVariableClassification>> idxBizPvPointProcessVariableClassificationHashMap = getIdxBizPvPointProcessVariableClassificationListOfAnaLyse();
+        idxBizPvPointProcessVariableClassificationHashMap.keySet().forEach(s -> {
+            List<IdxBizPvPointProcessVariableClassification> list = idxBizPvPointProcessVariableClassificationHashMap.get(s);
+            list.forEach(idxBizPvPointProcessVariableClassification -> {
+                List<IdxBizPvPointVarCorrelation> gongkuangList = idxBizPvPointVarCorrelationMapper.selectList(new QueryWrapper<IdxBizPvPointVarCorrelation>().eq("ANALYSIS_GATEWAY_ID", idxBizPvPointProcessVariableClassification.getGatewayId()).eq("ANALYSIS_POINT_ID", idxBizPvPointProcessVariableClassification.getSequenceNbr()).orderByDesc("CORRELATION_COEFFICIENT").last("limit 0,3"));
+                if (gongkuangList.size() > 0) {
+                    foreachHandlerConditionVariabAnalyse1Pv(s, gongkuangList, startTime, endTime, idxBizPvPointProcessVariableClassification);
+                }
+
+            });
+        });
+    }
+
+    //中心值参数组装-风电
+    public void foreachHandlerConditionVariabAnalyse1Fan(String tableName, List<IdxBizFanPointVarCorrelation> list, String startTime, String endTime, IdxBizFanPointProcessVariableClassification IdxBizFanPointProcessVariableClassification) {
+        String sql0 = String.format("select value from %s where address='%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress());
+        List<Map<String, Object>> returnList = influxdbUtil.query(sql0);
+        List<Map<String, Object>> params = new ArrayList<>();
+        returnList.forEach((k) -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("analysisVariable", Double.parseDouble(k.get("value").toString()));
+            map.put("analysisVariableId", Long.parseLong(IdxBizFanPointProcessVariableClassification.getSequenceNbr()));
+            params.add(map);
+        });
+        logger.info("--------------------------------------风机中心值------开始查询influxdb--------------------------------");
+        List<Map<String, Object>> params1 = new ArrayList<>();
+        List<Map<String, Object>> requestParams = new ArrayList<>();
+//            String sql = String.format("select value from %s where address='%s' and where time >= '%s' and where time <= '%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+        String sql = String.format("select value from %s where address='%s' ", tableName, list.get(0).getProcessIndexAddress());
+        String sql1 = String.format("select value from %s where address='%s' ", tableName, list.get(1).getProcessIndexAddress());
+        String sql2 = String.format("select value from %s where address='%s' ", tableName, list.get(2).getProcessIndexAddress());
+        List<HashMap<String, Object>> values = new ArrayList<>();
+        List<String> processPointIds = list.stream().map(IdxBizFanPointVarCorrelation -> IdxBizFanPointVarCorrelation.getProcessPointId().toString()).collect(Collectors.toList());
+        List<IdxBizFanPointProcessVariableClassification> idxBizFanPointProcessVariableClassificationList = idxBizFanPointProcessVariableClassificationMapper.selectList(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().in("SEQUENCE_NBR", processPointIds));
+        //区间值1
+        HashMap<String, Object> value1 = new HashMap<>();
+        value1.put("processVariable1", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue1())?0.0:idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue1());
+        value1.put("processVariable2", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue1())?0.0:idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue1());
+        value1.put("processVariable3", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue1())?0.0:idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue1());
+        values.add(value1);
+        //区间值2
+        HashMap<String, Object> value2 = new HashMap<>();
+        value2.put("processVariable1", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue2())?0.0:idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue2());
+        value2.put("processVariable2", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue2())?0.0:idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue2());
+        value2.put("processVariable3", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue2())?0.0:idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue2());
+        values.add(value2);
+        //区间值3
+        HashMap<String, Object> value3 = new HashMap<>();
+        value3.put("processVariable1", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue3())?0.0:idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue3());
+        value3.put("processVariable2", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue3())?0.0:idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue3());
+        value3.put("processVariable3", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue3())?0.0:idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue3());
+        values.add(value3);
+        //区间值4
+        HashMap<String, Object> value4 = new HashMap<>();
+        value4.put("processVariable1", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue4())?0.0:idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue4());
+        value4.put("processVariable2", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue4())?0.0:idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue4());
+        value4.put("processVariable3", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue4())?0.0:idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue4());
+        values.add(value4);
+        //区间值5
+        HashMap<String, Object> value5 = new HashMap<>();
+        value5.put("processVariable1", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue5())?0.0:idxBizFanPointProcessVariableClassificationList.get(2).getIntervalValue5());
+        value5.put("processVariable2", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue5())?0.0:idxBizFanPointProcessVariableClassificationList.get(1).getIntervalValue5());
+        value5.put("processVariable3", ObjectUtils.isEmpty(idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue5())?0.0:idxBizFanPointProcessVariableClassificationList.get(0).getIntervalValue5());
+        values.add(value5);
+        List<Map<String, Object>> returnList0 = influxdbUtil.query(sql);
+        List<Map<String, Object>> maxList = returnList0;
+        List<Map<String, Object>> returnList1 = influxdbUtil.query(sql);
+        maxList = maxList.size() > returnList1.size() ? maxList : returnList1;
+        List<Map<String, Object>> returnList2 = influxdbUtil.query(sql);
+        maxList = maxList.size() > returnList2.size() ? maxList : returnList2;
+        for (int j = 0; j < maxList.size(); j++) {
+            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map1 = new HashMap<>();
+            Map<String, Object> map2 = new HashMap<>();
+            Map<String, Object> map3 = new HashMap<>();
+            if (j < returnList0.size() - 1) {
+                map1 = returnList0.get(j);
+            } else {
+                map1 = returnList0.get(returnList0.size() - 1);
+            }
+            if (j < returnList1.size() - 1) {
+                map2 = returnList1.get(j);
+            } else {
+                map2 = returnList1.get(returnList1.size() - 1);
+            }
+            if (j < returnList2.size() - 1) {
+                map3 = returnList2.get(j);
+            } else {
+                map3 = returnList2.get(returnList2.size() - 1);
+            }
+            map.put("processVariable1", Double.parseDouble(map1.get("value").toString()));
+            map.put("processVariable1Id", Long.parseLong(list.get(0).getProcessPointId().toString()));
+            map.put("processVariable2", Double.parseDouble(map2.get("value").toString()));
+            map.put("processVariable2Id", Long.parseLong(list.get(1).getProcessPointId().toString()));
+            map.put("processVariable3", Double.parseDouble(map3.get("value").toString()));
+            map.put("processVariable3Id", Long.parseLong(list.get(2).getProcessPointId().toString()));
+            params1.add(map);
+            if (params.size() >= params1.size()) {
+                requestParams = megreMapList1(params, params1);
+            } else {
+                requestParams = megreMapList1(params1, params);
+            }
+            if (!requestParams.isEmpty()) {
+                logger.info("---------------------------------风机中心值---------开始调用中心值计算算法开始----------------------------------------");
+                HashMap<String, Object> realParams = new HashMap<>();
+                realParams.put(gkzxzjskey1, requestParams);
+                realParams.put(gkzxzjskey2, values);
+                logger.info("------------------------------风机中心值------请求参数---------------------------------------" + JSON.toJSONString(realParams));
+                String response = HttpUtil.createPost(baseUrl + gkzxzjsurl).body(JSON.toJSONString(realParams)).execute().body();
+                try {
+                    logger.info("------------------风机中心值--repsonse： " + response);
+                    TimeUnit.SECONDS.sleep(sleepTime);
+                    logger.info("-----------------------------------风机中心值-------调用中心值计算算法结束----------------------------------------");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+    }
+
+    //中心值参数组装-光伏
+    public void foreachHandlerConditionVariabAnalyse1Pv(String tableName, List<IdxBizPvPointVarCorrelation> list, String startTime, String endTime, IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification) {
+        String sql0 = String.format("select value from %s where address='%s' ", tableName, idxBizPvPointProcessVariableClassification.getIndexAddress());
+        List<Map<String, Object>> returnList = influxdbUtil.query(sql0);
+        List<Map<String, Object>> params = new ArrayList<>();
+        returnList.forEach((k) -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("analysisVariable", Double.parseDouble(k.get("value").toString()));
+            map.put("analysisVariableId", Long.parseLong(idxBizPvPointProcessVariableClassification.getSequenceNbr()));
+            params.add(map);
+        });
+        logger.info("-----------------------------------光伏中心值---------开始查询influxdb--------------------------------");
+        List<Map<String, Object>> params1 = new ArrayList<>();
+        List<Map<String, Object>> requestParams = new ArrayList<>();
+//            String sql = String.format("select value from %s where address='%s' and where time >= '%s' and where time <= '%s' ", tableName, IdxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+        String sql = String.format("select value from %s where address='%s' ", tableName, list.get(0).getProcessIndexAddress());
+        String sql1 = String.format("select value from %s where address='%s' ", tableName, list.get(1).getProcessIndexAddress());
+        String sql2 = String.format("select value from %s where address='%s' ", tableName, list.get(2).getProcessIndexAddress());
+        List<HashMap<String, Object>> values = new ArrayList<>();
+        List<String> processPointIds = list.stream().map(idxBizPvPointVarCorrelation -> idxBizPvPointVarCorrelation.getProcessPointId().toString()).collect(Collectors.toList());
+        List<IdxBizPvPointProcessVariableClassification> idxBizPvPointProcessVariableClassificationList = idxBizPvPointProcessVariableClassificationMapper.selectList(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().in("SEQUENCE_NBR", processPointIds));
+        //区间值1
+        HashMap<String, Object> value1 = new HashMap<>();
+        value1.put("processVariable1", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue1())?0.0:idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue1());
+        value1.put("processVariable2", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue1())?0.0:idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue1());
+        value1.put("processVariable3", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue1())?0.0:idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue1());
+        values.add(value1);
+        //区间值2
+        HashMap<String, Object> value2 = new HashMap<>();
+        value2.put("processVariable1", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue2())?0.0:idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue2());
+        value2.put("processVariable2", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue2())?0.0:idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue2());
+        value2.put("processVariable3", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue2())?0.0:idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue2());
+        values.add(value2);
+        //区间值3
+        HashMap<String, Object> value3 = new HashMap<>();
+        value3.put("processVariable1", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue3())?0.0:idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue3());
+        value3.put("processVariable2", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue3())?0.0:idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue3());
+        value3.put("processVariable3", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue3())?0.0:idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue3());
+        values.add(value3);
+        //区间值4
+        HashMap<String, Object> value4 = new HashMap<>();
+        value4.put("processVariable1", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue4())?0.0:idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue4());
+        value4.put("processVariable2", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue4())?0.0:idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue4());
+        value4.put("processVariable3", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue4())?0.0:idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue4());
+        values.add(value4);
+        //区间值5
+        HashMap<String, Object> value5 = new HashMap<>();
+        value5.put("processVariable1", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue5())?0.0:idxBizPvPointProcessVariableClassificationList.get(2).getIntervalValue5());
+        value5.put("processVariable2", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue5())?0.0:idxBizPvPointProcessVariableClassificationList.get(1).getIntervalValue5());
+        value5.put("processVariable3", ObjectUtils.isEmpty(idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue5())?0.0:idxBizPvPointProcessVariableClassificationList.get(0).getIntervalValue5());
+        values.add(value5);
+        List<Map<String, Object>> returnList0 = influxdbUtil.query(sql);
+        List<Map<String, Object>> maxList = returnList0;
+        List<Map<String, Object>> returnList1 = influxdbUtil.query(sql);
+        maxList = maxList.size() > returnList1.size() ? maxList : returnList1;
+        List<Map<String, Object>> returnList2 = influxdbUtil.query(sql);
+        maxList = maxList.size() > returnList2.size() ? maxList : returnList2;
+        for (int j = 0; j < maxList.size(); j++) {
+            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map1 = new HashMap<>();
+            Map<String, Object> map2 = new HashMap<>();
+            Map<String, Object> map3 = new HashMap<>();
+            if (j < returnList0.size() - 1) {
+                map1 = returnList0.get(j);
+            } else {
+                map1 = returnList0.get(returnList0.size() - 1);
+            }
+            if (j < returnList1.size() - 1) {
+                map2 = returnList1.get(j);
+            } else {
+                map2 = returnList1.get(returnList1.size() - 1);
+            }
+            if (j < returnList2.size() - 1) {
+                map3 = returnList2.get(j);
+            } else {
+                map3 = returnList2.get(returnList2.size() - 1);
+            }
+            map.put("processVariable1", Double.parseDouble(map1.get("value").toString()));
+            map.put("processVariable1Id", Long.parseLong(list.get(0).getProcessPointId().toString()));
+            map.put("processVariable2", Double.parseDouble(map2.get("value").toString()));
+            map.put("processVariable2Id", Long.parseLong(list.get(1).getProcessPointId().toString()));
+            map.put("processVariable3", Double.parseDouble(map3.get("value").toString()));
+            map.put("processVariable3Id", Long.parseLong(list.get(2).getProcessPointId().toString()));
+            params1.add(map);
+            if (params.size() >= params1.size()) {
+                requestParams = megreMapList1(params, params1);
+            } else {
+                requestParams = megreMapList1(params1, params);
+            }
+            if (!requestParams.isEmpty()) {
+                logger.info("-------------------------------------光伏中心值-----开始调用中心值计算算法----------------------------------------");
+                HashMap<String, Object> realParams = new HashMap<>();
+                realParams.put(gkzxzjskey1, requestParams);
+                realParams.put(gkzxzjskey2, values);
+                String response = HttpUtil.createPost(baseUrl + gkzxzjsurl).body(JSON.toJSONString(realParams)).execute().body();
+                try {
+                    logger.info("-------------光伏中心值-------repsonse： " + response);
+                    TimeUnit.SECONDS.sleep(sleepTime);
+                    logger.info("-----------------------------------光伏中心值-------调用中心值计算算法结束----------------------------------------");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+    }
+
+    public List<Map<String, Object>> megreMapList1(List<Map<String, Object>> longList, List<Map<String, Object>> shortList) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (int i = 0; i < longList.size(); i++) {
+            Map<String, Object> map = new HashMap<>();
+            map.putAll(longList.get(i));
+            Map<String, Object> mapOfShortList = new HashMap<>();
+            if (i < shortList.size() - 1) {
+                mapOfShortList.putAll(shortList.get(i));
+            } else {
+                mapOfShortList.putAll(shortList.get(shortList.size() - 1));
+            }
+            if (!map.containsKey("processVariable1")) {
+                map.put("processVariable1", mapOfShortList.get("processVariable1"));
+                map.put("processVariable1Id", mapOfShortList.get("processVariable1Id"));
+                map.put("processVariable2", mapOfShortList.get("processVariable2"));
+                map.put("processVariable2Id", mapOfShortList.get("processVariable2Id"));
+                map.put("processVariable3", mapOfShortList.get("processVariable3"));
+                map.put("processVariable3Id", mapOfShortList.get("processVariable3Id"));
+            } else {
+                map.put("analysisVariable", mapOfShortList.get("analysisVariable"));
+                map.put("analysisVariableId", mapOfShortList.get("analysisVariableId"));
+            }
+            resultList.add(map);
+        }
+        return resultList;
+    }
+
+    public List<Map<String, Object>> getInfluxdbDataByConditon(String stationType, String pointId, String startTime, String endTime) {
+        String sql = "";
+        if ("FD".equals(stationType)) {
+            IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification = idxBizFanPointProcessVariableClassificationMapper.selectById(pointId);
+            sql = String.format("select * from iot_data_%s where address ='%s' and time > '%s' and time < '%s' ;", idxBizFanPointProcessVariableClassification.getGatewayId(), idxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+        } else {
+            IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification = idxBizPvPointProcessVariableClassificationMapper.selectById(pointId);
+            sql = String.format("select * from iot_data_%s where address ='%s' and time > '%s' and time < '%s' ;", idxBizPvPointProcessVariableClassification.getGatewayId(), idxBizPvPointProcessVariableClassification.getIndexAddress(), startTime, endTime);
+        }
+        return influxdbUtil.query(sql);
+    }
+
+    public String getUtcTimeString(String timeStr) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(FORMAT_UTC);
+        return dateFormat.format(timeStr);
+    }
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUhefDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUxfvDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPldo;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUhef;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizUxfv;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPldoMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizUhefMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizUxfvMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.SearchHit;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class HealthStatusIndicatorServiceImpl {
+
+    @Autowired
+    private IdxBizUhefMapper idxBizUhefMapper;
+    @Autowired
+    private IdxBizUxfvMapper idxBizUxfvMapper;
+    @Autowired
+    private IdxBizPldoMapper idxBizPldoMapper;
+    @Autowired
+    private InfluxDButils influxDButils;
+    @Autowired
+    private ElasticsearchRestTemplate elasticsearchTemplate;
+
+
+    @Scheduled(cron = "0/10 * * * * ? ")
+    private void mother() {
+        List<IdxBizUxfvDto> data = idxBizUxfvMapper.getInfluxDBData();
+
+        Map<String, List<IdxBizUxfvDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizUxfvDto::getGatewayId));
+        BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
+
+
+        List<QueryBuilder> should = boolMustAll.should();
+        for (String s : maps.keySet()) {
+            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+            List<String> address = maps.get(s).stream().map(IdxBizUxfvDto::getIndexAddress).collect(Collectors.toList());
+            boolQueryBuilder.must(QueryBuilders.termsQuery("address.keyword", address)).must(QueryBuilders.matchQuery("gatewayId.keyword", s));
+            should.add(boolQueryBuilder);
+        }
+
+        // 创建查询构造器
+        NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
+                //过滤条件
+                .withQuery(boolMustAll);
+        List<ESEquipments> equipments = new LinkedList<>();
+        long totle = 0;
+        try {
+            SearchHits<ESEquipments> searchHits = elasticsearchTemplate.search(queryBuilder.build(), ESEquipments.class);
+
+            for (SearchHit searchHit : searchHits.getSearchHits()) {
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
+                ESEquipments eSAlertCalled = JSONObject.toJavaObject(jsonObject, ESEquipments.class);
+                equipments.add(eSAlertCalled);
+            }
+            totle = searchHits.getTotalHits();
+        } catch (Exception e) {
+            // TODO: handle exception
+        }
+
+
+        for (IdxBizUxfvDto datum : data) {
+            for (ESEquipments equipment : equipments) {
+                if (equipment.getAddress().equals(datum.getIndexAddress()) && equipment.getGatewayId().equals(datum.getGatewayId())){
+                    datum.setCurrentValue(equipment.getValueDouble());
+                }
+            }
+        }
+
+        LambdaQueryWrapper<IdxBizUhef> wrapper = new LambdaQueryWrapper<>();
+        List<IdxBizUhef> idxBizUhefs = idxBizUhefMapper.selectList(wrapper);
+        List< Map<String, Object>> datas = new ArrayList<>();
+        for (IdxBizUhef idxBizUhef : idxBizUhefs) {
+            double value1 = 0.00;
+            double value2 = 0.00;
+            double value3 = 0.00;
+            double value4 = 0.00;
+
+            for (IdxBizUxfvDto datum : data) {
+               if (idxBizUhef.getPointOneId().equals(datum.getSequenceNbr())){
+                    value1 = datum.getCurrentValue();
+                }
+                if (idxBizUhef.getPointTwoId().equals(datum.getSequenceNbr())) {
+                    value2 = datum.getCurrentValue();
+                }
+                if (idxBizUhef.getPointThreeId().equals(datum.getSequenceNbr())) {
+                    value3 = datum.getCurrentValue();
+                }
+                if (idxBizUhef.getAnalysisPointId().equals(datum.getSequenceNbr())) {
+                    value4 = datum.getCurrentValue();
+                }
+
+            }
+            if (idxBizUhef.getProcess1Min() < value1 && value1 < idxBizUhef.getProcess1Max() &&
+                    idxBizUhef.getProcess2Min() < value2 && value2 < idxBizUhef.getProcess2Max() &&
+                    idxBizUhef.getProcess3Min() < value3 && value3 < idxBizUhef.getProcess3Max()){
+
+                Map<String, Object> map = new HashMap<>();
+                map.put("analysVariable",value4);
+                map.put("stdDev",idxBizUhef.getAnalysisStdDev());
+                map.put("centerValue",idxBizUhef.getAnalysisCenterValue());
+                map.put("analysVariableId",idxBizUhef.getAnalysisPointId());
+                datas.add(map);
+
+                //算法接口 获取健康指数
+                double healthExponent = 0.00;
+
+                LambdaQueryWrapper<IdxBizPldo> healthQerry = new LambdaQueryWrapper<>();
+                healthQerry.ge(IdxBizPldo::getGroupLowerLimit,healthExponent);
+                healthQerry.le(IdxBizPldo::getGroupUpperLimit,healthExponent);
+                healthQerry.eq(IdxBizPldo::getAnalysisObjType,"设备");
+                IdxBizPldo idxBizPldo = idxBizPldoMapper.selectOne(healthQerry);
+
+                IdxBizFanHealthIndex idxBizFanHealthIndex = new IdxBizFanHealthIndex();
+
+            }
+
+
+
+        }
+
+
+
+        // TODO: data
+
+
+
+
+
+
+
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthIndexMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanHealthIndexService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanHealthIndexServiceImpl extends BaseService<IdxBizFanHealthIndexDto,IdxBizFanHealthIndex,IdxBizFanHealthIndexMapper> implements IIdxBizFanHealthIndexService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanHealthIndexDto> queryForIdxBizFanHealthIndexPage(Page<IdxBizFanHealthIndexDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanHealthIndexDto> queryForIdxBizFanHealthIndexList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanHealthLevelServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanHealthLevelDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanHealthLevel;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanHealthLevelService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanHealthLevelServiceImpl extends BaseService<IdxBizFanHealthLevelDto,IdxBizFanHealthLevel,IdxBizFanHealthLevelMapper> implements IIdxBizFanHealthLevelService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanHealthLevelDto> queryForIdxBizFanHealthLevelPage(Page<IdxBizFanHealthLevelDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanHealthLevelDto> queryForIdxBizFanHealthLevelList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanPointProcessVariableClassificationServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanPointProcessVariableClassificationService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanPointProcessVariableClassificationServiceImpl extends BaseService<IdxBizFanPointProcessVariableClassificationDto,IdxBizFanPointProcessVariableClassification,IdxBizFanPointProcessVariableClassificationMapper> implements IIdxBizFanPointProcessVariableClassificationService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanPointProcessVariableClassificationDto> queryForIdxBizFanPointProcessVariableClassificationPage(Page<IdxBizFanPointProcessVariableClassificationDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanPointProcessVariableClassificationDto> queryForIdxBizFanPointProcessVariableClassificationList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanPointTagServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointTagDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointTag;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointTagMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanPointTagService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanPointTagServiceImpl extends BaseService<IdxBizFanPointTagDto,IdxBizFanPointTag,IdxBizFanPointTagMapper> implements IIdxBizFanPointTagService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanPointTagDto> queryForIdxBizFanPointTagPage(Page<IdxBizFanPointTagDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanPointTagDto> queryForIdxBizFanPointTagList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanPointVarCentralValueServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointVarCentralValueDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointVarCentralValue;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointVarCentralValueMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanPointVarCentralValueService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanPointVarCentralValueServiceImpl extends BaseService<IdxBizFanPointVarCentralValueDto, IdxBizFanPointVarCentralValue, IdxBizFanPointVarCentralValueMapper> implements IIdxBizFanPointVarCentralValueService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanPointVarCentralValueDto> queryForIdxBizFanPointVarCentralValuePage(Page<IdxBizFanPointVarCentralValueDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanPointVarCentralValueDto> queryForIdxBizFanPointVarCentralValueList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanPointVarCorrelationServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointVarCorrelationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointVarCorrelation;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointVarCorrelationMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanPointVarCorrelationService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanPointVarCorrelationServiceImpl extends BaseService<IdxBizFanPointVarCorrelationDto, IdxBizFanPointVarCorrelation, IdxBizFanPointVarCorrelationMapper> implements IIdxBizFanPointVarCorrelationService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanPointVarCorrelationDto> queryForIdxBizFanPointVarCorrelationPage(Page<IdxBizFanPointVarCorrelationDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanPointVarCorrelationDto> queryForIdxBizFanPointVarCorrelationList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanWarningRecordServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanWarningRecordDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanWarningRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanWarningRecordService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanWarningRecordServiceImpl extends BaseService<IdxBizFanWarningRecordDto, IdxBizFanWarningRecord, IdxBizFanWarningRecordMapper> implements IIdxBizFanWarningRecordService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanWarningRecordDto> queryForIdxBizFanWarningRecordPage(Page<IdxBizFanWarningRecordDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanWarningRecordDto> queryForIdxBizFanWarningRecordList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizFanWarningRuleSetServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanWarningRuleSetDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRuleSet;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanWarningRuleSetMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizFanWarningRuleSetService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizFanWarningRuleSetServiceImpl extends BaseService<IdxBizFanWarningRuleSetDto, IdxBizFanWarningRuleSet, IdxBizFanWarningRuleSetMapper> implements IIdxBizFanWarningRuleSetService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizFanWarningRuleSetDto> queryForIdxBizFanWarningRuleSetPage(Page<IdxBizFanWarningRuleSetDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizFanWarningRuleSetDto> queryForIdxBizFanWarningRuleSetList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvHealthIndexServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthIndexDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthIndex;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthIndexMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvHealthIndexService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvHealthIndexServiceImpl extends BaseService<IdxBizPvHealthIndexDto, IdxBizPvHealthIndex, IdxBizPvHealthIndexMapper> implements IIdxBizPvHealthIndexService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvHealthIndexDto> queryForIdxBizPvHealthIndexPage(Page<IdxBizPvHealthIndexDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvHealthIndexDto> queryForIdxBizPvHealthIndexList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvHealthLevelServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvHealthLevelDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvHealthLevel;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvHealthLevelMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvHealthLevelService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvHealthLevelServiceImpl extends BaseService<IdxBizPvHealthLevelDto, IdxBizPvHealthLevel, IdxBizPvHealthLevelMapper> implements IIdxBizPvHealthLevelService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvHealthLevelDto> queryForIdxBizPvHealthLevelPage(Page<IdxBizPvHealthLevelDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvHealthLevelDto> queryForIdxBizPvHealthLevelList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvPointProcessVariableClassificationServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointProcessVariableClassification;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvPointProcessVariableClassificationMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvPointProcessVariableClassificationService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvPointProcessVariableClassificationServiceImpl extends BaseService<IdxBizPvPointProcessVariableClassificationDto, IdxBizPvPointProcessVariableClassification, IdxBizPvPointProcessVariableClassificationMapper> implements IIdxBizPvPointProcessVariableClassificationService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvPointProcessVariableClassificationDto> queryForIdxBizPvPointProcessVariableClassificationPage(Page<IdxBizPvPointProcessVariableClassificationDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvPointProcessVariableClassificationDto> queryForIdxBizPvPointProcessVariableClassificationList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvPointTagServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointTagDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointTag;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvPointTagMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvPointTagService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvPointTagServiceImpl extends BaseService<IdxBizPvPointTagDto, IdxBizPvPointTag, IdxBizPvPointTagMapper> implements IIdxBizPvPointTagService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvPointTagDto> queryForIdxBizPvPointTagPage(Page<IdxBizPvPointTagDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvPointTagDto> queryForIdxBizPvPointTagList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvPointVarCentralValueServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointVarCentralValueDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointVarCentralValue;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvPointVarCentralValueMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvPointVarCentralValueService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvPointVarCentralValueServiceImpl extends BaseService<IdxBizPvPointVarCentralValueDto, IdxBizPvPointVarCentralValue, IdxBizPvPointVarCentralValueMapper> implements IIdxBizPvPointVarCentralValueService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvPointVarCentralValueDto> queryForIdxBizPvPointVarCentralValuePage(Page<IdxBizPvPointVarCentralValueDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvPointVarCentralValueDto> queryForIdxBizPvPointVarCentralValueList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvPointVarCorrelationServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointVarCorrelationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointVarCorrelation;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvPointVarCorrelationMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvPointVarCorrelationService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvPointVarCorrelationServiceImpl extends BaseService<IdxBizPvPointVarCorrelationDto,IdxBizPvPointVarCorrelation,IdxBizPvPointVarCorrelationMapper> implements IIdxBizPvPointVarCorrelationService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvPointVarCorrelationDto> queryForIdxBizPvPointVarCorrelationPage(Page<IdxBizPvPointVarCorrelationDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvPointVarCorrelationDto> queryForIdxBizPvPointVarCorrelationList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvWarningRecordServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvWarningRecordDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRecord;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvWarningRecordMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvWarningRecordService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvWarningRecordServiceImpl extends BaseService<IdxBizPvWarningRecordDto,IdxBizPvWarningRecord,IdxBizPvWarningRecordMapper> implements IIdxBizPvWarningRecordService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvWarningRecordDto> queryForIdxBizPvWarningRecordPage(Page<IdxBizPvWarningRecordDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvWarningRecordDto> queryForIdxBizPvWarningRecordList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxBizPvWarningRuleSetServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvWarningRuleSetDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRuleSet;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizPvWarningRuleSetMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxBizPvWarningRuleSetService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxBizPvWarningRuleSetServiceImpl extends BaseService<IdxBizPvWarningRuleSetDto,IdxBizPvWarningRuleSet,IdxBizPvWarningRuleSetMapper> implements IIdxBizPvWarningRuleSetService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxBizPvWarningRuleSetDto> queryForIdxBizPvWarningRuleSetPage(Page<IdxBizPvWarningRuleSetDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxBizPvWarningRuleSetDto> queryForIdxBizPvWarningRuleSetList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/IdxExplorerServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxExplorerDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxExplorer;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxExplorerMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.IIdxExplorerService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-15
+ */
+@Service
+public class IdxExplorerServiceImpl extends BaseService<IdxExplorerDto,IdxExplorer,IdxExplorerMapper> implements IIdxExplorerService {
+    /**
+     * 分页查询
+     */
+    public Page<IdxExplorerDto> queryForIdxExplorerPage(Page<IdxExplorerDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<IdxExplorerDto> queryForIdxExplorerList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

 ## DB properties:
 ## db1-production database
 spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db1.datasource.url=jdbc:mysql://39.98.223.23:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.url=jdbc:mysql://39.98.224.23:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db1.datasource.username=root
 spring.db1.datasource.password=Yeejoin@2020
 spring.db1.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
-spring.db2.datasource.url=jdbc:mysql://172.16.10.220:3306/yeeamos_amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.url=jdbc:mysql://36.40.66.175:3306/yeeamos_amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
 spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -73,4 +73,10 @@ station.isok=false
 station.section=10
 
 gl.sum.column=日发电量,月发电量,年发电量
-gl.avg.column=有功功率,日利用小时,瞬时风速
+gl.avg.column=有功功率,日利用小时,瞬时风速
\ No newline at end of file
+
+spring.elasticsearch.rest.uris=http://39.98.224.23:9200
+spring.elasticsearch.rest.connection-timeout=30000
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=123456
+spring.elasticsearch.rest.read-timeout=30000

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizC80cMapper.xml

@@ -2,6 +2,6 @@
 <!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.jxiop.biz.mapper2.IdxBizC80cMapper">
     <select id="gateWayIdListFan" resultType="java.lang.String">
-        select ANALYSIS_GATEWAY_ID from idx_biz_c80c group by ANALYSIS_GATEWAY_ID;
+        select ANALYSIS_GATEWAY_ID from idx_biz_fan_point_var_correlation group by ANALYSIS_GATEWAY_ID;
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.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.jxiop.biz.mapper2.IdxBizFanHealthIndexMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthLevelMapper.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.jxiop.biz.mapper2.IdxBizFanHealthLevelMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.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.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper">
+    <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification">
+        SELECT b.*,
+        ibfpvcv.PROCESS_POINT1_ID as pointOneId,
+        ibfpvcv.PROCESS_POINT2_ID as pointTwoId,
+        ibfpvcv.PROCESS_POINT3_ID as pointThreeId,
+        ibfpvcv.ANALYSIS_POINT_ID as pointId
+        FROM (
+        SELECT *
+        FROM idx_biz_uxfv uxfv
+        WHERE uxfv.SEQUENCE_NBR IN (
+        SELECT PROCESS_POINT1_ID
+        FROM `idx_biz_fan_point_var_central_value`
+        WHERE ANALYSIS_POINT_ID IS NOT NULL
+        GROUP BY ANALYSIS_POINT_ID,
+        PROCESS_POINT1_ID,
+        PROCESS_POINT3_ID,
+        PROCESS_POINT2_ID
+        UNION ALL
+        SELECT PROCESS_POINT2_ID
+        FROM `idx_biz_fan_point_var_central_value`
+        WHERE ANALYSIS_POINT_ID IS NOT NULL
+        GROUP BY ANALYSIS_POINT_ID,
+        PROCESS_POINT1_ID,
+        PROCESS_POINT3_ID,
+        PROCESS_POINT2_ID
+        UNION ALL
+        SELECT PROCESS_POINT3_ID
+        FROM `idx_biz_fan_point_var_central_value`
+        WHERE ANALYSIS_POINT_ID IS NOT NULL
+        GROUP BY ANALYSIS_POINT_ID,
+        PROCESS_POINT1_ID,
+        PROCESS_POINT3_ID,
+        PROCESS_POINT2_ID
+        UNION ALL
+        SELECT ANALYSIS_POINT_ID
+        FROM `idx_biz_fan_point_var_central_value`
+        WHERE ANALYSIS_POINT_ID IS NOT NULL
+        GROUP BY ANALYSIS_POINT_ID,
+        PROCESS_POINT1_ID,
+        PROCESS_POINT3_ID,
+        PROCESS_POINT2_ID
+        )) AS b,
+        idx_biz_fan_point_var_central_value ibfpvcv
+        WHERE b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
+        OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
+        OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
+        GROUP BY b.SEQUENCE_NBR
+    </select>
+
+    <select id="gateWayIdListFan" resultType="java.lang.String">
+        select GATEWAY_ID from idx_biz_fan_point_process_variable_classification group by GATEWAY_ID;
+    </select>
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointTagMapper.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.jxiop.biz.mapper2.IdxBizFanPointTagMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointVarCentralValueMapper.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.jxiop.biz.mapper2.IdxBizFanPointVarCentralValueMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointVarCorrelationMapper.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.jxiop.biz.mapper2.IdxBizFanPointVarCorrelationMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.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.jxiop.biz.mapper2.IdxBizFanWarningRecordMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRuleSetMapper.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.jxiop.biz.mapper2.IdxBizFanWarningRuleSetMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthIndexMapper.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.jxiop.biz.mapper2.IdxBizPvHealthIndexMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthLevelMapper.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.jxiop.biz.mapper2.IdxBizPvHealthLevelMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointProcessVariableClassificationMapper.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.jxiop.biz.mapper2.IdxBizPvPointProcessVariableClassificationMapper">
+    <select id="gateWayIdListPv" resultType="java.lang.String">
+        select GATEWAY_ID from idx_biz_pv_point_process_variable_classification group by GATEWAY_ID;
+    </select>
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointTagMapper.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.jxiop.biz.mapper2.IdxBizPvPointTagMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointVarCentralValueMapper.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.jxiop.biz.mapper2.IdxBizPvPointVarCentralValueMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointVarCorrelationMapper.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.jxiop.biz.mapper2.IdxBizPvPointVarCorrelationMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvWarningRecordMapper.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.jxiop.biz.mapper2.IdxBizPvWarningRecordMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvWarningRuleSetMapper.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.jxiop.biz.mapper2.IdxBizPvWarningRuleSetMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizUhefMapper.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.jxiop.biz.mapper2.IdxBizUhefMapper">
+<select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUhefDto">
+    SELECT
+       *
+    FROM
+
+
+        ( SELECT * FROM `idx_biz_uhef` WHERE ANALYSIS_POINT_ID IS NOT NULL GROUP BY ANALYSIS_POINT_ID ) AS a
+            LEFT JOIN idx_biz_uxfv uxfv ON a.ANALYSIS_POINT_ID = uxfv.SEQUENCE_NBR
+</select>
+
+
 
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizUxfvMapper.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.jxiop.biz.mapper2.IdxBizUxfvMapper">
+    <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizUxfvDto">
+        SELECT b.*,
+               ibfpvcv.PROCESS_POINT1_ID as pointOneId,
+               ibfpvcv.PROCESS_POINT2_ID as pointTwoId,
+               ibfpvcv.PROCESS_POINT3_ID as pointThreeId,
+               ibfpvcv.ANALYSIS_POINT_ID as pointId
+        FROM (
+                 SELECT *
+                 FROM idx_biz_uxfv uxfv
+                 WHERE uxfv.SEQUENCE_NBR IN (
+                     SELECT PROCESS_POINT1_ID
+                     FROM `idx_biz_fan_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT PROCESS_POINT2_ID
+                     FROM `idx_biz_fan_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT PROCESS_POINT3_ID
+                     FROM `idx_biz_fan_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT ANALYSIS_POINT_ID
+                     FROM `idx_biz_fan_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                 )) AS b,
+             idx_biz_fan_point_var_central_value ibfpvcv
+        WHERE b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
+        GROUP BY b.SEQUENCE_NBR
+    </select>
 
+    <select id="gateWayIdListFan" resultType="java.lang.String">
+        select GATEWAY_ID from idx_biz_fan_point_process_variable_classification group by GATEWAY_ID;
+    </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxExplorerMapper.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.jxiop.biz.mapper2.IdxExplorerMapper">
+
+</mapper>

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

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.jxiop.api.Enum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ *            【 此类弃用  】
+ */
 @Getter
 @AllArgsConstructor
 public enum QrcodePostEnum {

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/CertificateDto.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CertificateDto implements Serializable {
+
+    /**
+     * 证书集合  【逗号隔开】
+     */
+    private String certificates;
+
+    /**
+     * 距过期还有多少天 【已过期的不会出现在这里】
+     */
+    private Integer expirationDays;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonYardDto.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PersonYardDto implements Serializable {
+    /**
+     * 岗位
+     */
+    private String postName;
+
+    /**
+     * 人员表主键ID
+     */
+    private Long personId;
+
+    /**
+     * 证书信息
+     */
+    private List<CertificateDto> certificateDtoList;
+
+}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 场站基础信息表 Mapper 接口
@@ -57,4 +58,10 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
      */
     List<TreeDto> getStationListByRegionCode(@Param("regionCode")String regionCode);
 
+    /**
+     * 根据ProjectOrgCode更新红黄绿码
+     * @param analysisResult 更新数据信息
+     */
+    int updateYardByProjectOrgCode(@Param("list") List<Map<String,String>> analysisResult);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/util/Constants.java

@@ -59,6 +59,16 @@ public class Constants {
             "table|from|grant|use|group_concat|column_name|" +
             "information_schema.columns|table_schema|union|where|select|delete|update|order|by|count|" +
             "chr|mid|master|truncate|char|declare|or|;|-|--|,|like|//|/|%|#";
+
+    /**
+     * 江西电建岗位字典key
+     */
+    public static final String JXIOP_DICT_POST = "jxIop:dict:post";
+
+    /**
+     * 江西电建证书字典key
+     */
+    public static final String JXIOP_DICT_CERTIFICATES = "jxIop:dict:certificates";
 }
 
 

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

@@ -168,4 +168,15 @@
             </if>
         </where>
     </select>
+
+    <update id="updateYardByProjectOrgCode">
+        <foreach collection="list" item="item" separator=";">
+            update
+            `station_basic`
+            set
+            `qrcode_color` = #{item.qrcodeColor}
+            where
+            project_org_code = #{item.code}
+        </foreach>
+    </update>
 </mapper>

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

@@ -27,6 +27,7 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.aggregations.Aggregation;
@@ -1039,5 +1040,59 @@ public class MonitorFanIdxController extends BaseController {
 
     }
 
+    //@Scheduled(cron = "0/10 * * * * ? ")
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "测试方法 ")
+    @GetMapping("/testaaaa")
+    public   void mother(){
+        //    List<IdxBizUhefDto> data = idxBizUhefMapper.getInfluxDBData();
+        //     Map<String, List<IdxBizUhefDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizUhefDto::getGatewayId));
+        BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
+        Map<String,String> maps = new HashMap<>();
+        maps.put("1668801435891929089", "123");
+        maps.put("1669524885619085313", "123");
+
+        List<QueryBuilder> should = boolMustAll.should();
+        for (String s : maps.keySet()) {
+            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+            //     List<String> address = maps.get(s).stream().map(IdxBizUhefDto::getAddress).collect(Collectors.toList());
+            //警情状态
+     //       BoolQueryBuilder qb0 = QueryBuilders.boolQuery();
+            //    qb0.must((QueryBuilders.termsQuery("address.keyword", address)));
+            String[] keys = new String[] {"日发电量","月发电量","年发电量"};
+            List<String> list = Arrays.asList(keys);
+      //      qb0.must((QueryBuilders.termsQuery("equipmentIndexName.keyword", list)));
+         //   qb0.must(QueryBuilders.matchQuery("gatewayId.keyword",s));
+         //   boolQueryBuilder.must(qb0);
+
+            boolQueryBuilder.must(QueryBuilders.termsQuery("equipmentIndexName.keyword", list)).must(QueryBuilders.matchQuery("gatewayId.keyword",s));
+            should.add(boolQueryBuilder);
+        }
+
+        // 创建查询构造器
+        NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
+                //过滤条件
+                .withQuery(boolMustAll);
+        List<ESEquipments> equipments = new LinkedList<>();
+        long totle = 0;
+        try
+        {
+            SearchHits<ESEquipments> searchHits =elasticsearchTemplate.search(queryBuilder.build(), ESEquipments.class);
+
+            for (SearchHit searchHit : searchHits.getSearchHits())
+            {
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
+                ESEquipments eSAlertCalled =JSONObject.toJavaObject(jsonObject, ESEquipments.class);
+                equipments.add(eSAlertCalled);
+            }
+            totle =searchHits.getTotalHits();
+        }
+        catch (Exception e)
+        {
+            // TODO: handle exception
+        }
+
+    }
+
 
 }

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

@@ -41,6 +41,12 @@
           <artifactId>spring-boot-starter-activemq</artifactId>
           <version>2.5.4</version>
       </dependency>
+      <dependency>
+          <groupId>net.sf.json-lib</groupId>
+          <artifactId>json-lib</artifactId>
+          <version>2.4</version>
+          <classifier>jdk15</classifier>
+      </dependency>
   </dependencies>
   
   <build>

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

@@ -54,14 +54,20 @@ public class PersonBasicController extends BaseController {
 
 	    try {
             personBasicServiceImpl.addPerson(model, httpServletRequest);
-        }catch (InnerInvokException | ParseException e){
+        }catch (Exception e){
             e.printStackTrace();
             return  this.buildResponseFalse(e.getMessage());
         }
 	    return ResponseHelper.buildResponse(null);
 	}
 
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/addRedisPostAndCerInfo")
+    @ApiOperation(httpMethod = "POST", value = "岗位和证书信息缓存至redis", notes = "岗位和证书信息缓存至redis")
+    public ResponseModel<Object> addRedisPostAndCerInfo() {
+            personBasicServiceImpl.addRedisPostAndCerInfo();
+        return ResponseHelper.buildResponse(null);
+    }
 
 
 
@@ -148,7 +154,7 @@ public class PersonBasicController extends BaseController {
                 projectName,orgCode));
     }
 
-    
+
 	/**
 	 * 列表全部数据查询
      *

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/StationYardMessage.java

+package com.yeejoin.amos.boot.module.jxiop.biz.emqx;
+
+import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
+import lombok.extern.slf4j.Slf4j;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.component.emq.EmqxListener;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+@Component
+@EnableScheduling
+@Slf4j
+public class StationYardMessage extends EmqxListener {
+
+    @Autowired
+    private AmosRequestContext amosAuth;
+
+    @Autowired
+    protected EmqKeeper emqKeeper;
+
+    @Autowired
+    private StationBasicMapper stationBasicMapper;
+
+
+    // 江西电建接收红黄绿码主题
+    private static final String JXIOP_STATION_YARD = "jxIop/station/yard";
+
+    private static final BlockingQueue<List<Map<String, String>>> blockingQueue = new LinkedBlockingQueue<List<Map<String, String>>>();
+
+    @PostConstruct
+    void init() throws Exception {
+        new Thread(taskRunnable).start();
+        emqKeeper.subscript(JXIOP_STATION_YARD, 2, this);
+    }
+
+    @Override
+    public void processMessage(String topic, MqttMessage message) throws Exception {
+
+        JSONArray ja = JSONArray.parseArray(new String(message.getPayload()));
+        List<Map<String, String>> liMap = JSONArray.toJavaObject(ja, List.class);
+        blockingQueue.add(liMap);
+
+    }
+
+    Runnable taskRunnable = new Runnable() {
+        @Override
+        public void run() {
+            boolean isRun = true;
+            int k = 0;
+            while (isRun) {
+                k++;
+                isRun = k < Integer.MAX_VALUE;
+                try {
+                    List<Map<String, String>> analysisResult = blockingQueue.take();
+                    RequestContext.setAppKey(amosAuth.getAppKey());
+                    RequestContext.setProduct(amosAuth.getProduct());
+                    RequestContext.setToken(amosAuth.getToken());
+                    jxIopUpdate(analysisResult);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    };
+
+    public void jxIopUpdate(List<Map<String, String>> analysisResult) {
+        log.info("场站红黄绿码数据：{}", analysisResult);
+        stationBasicMapper.updateYardByProjectOrgCode(analysisResult);
+    }
+}

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

@@ -6,15 +6,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.Enum.QrcodeColorEnum;
-import com.yeejoin.amos.boot.module.jxiop.api.Enum.QrcodePostEnum;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonAccountFedMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
+import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
 import com.yeejoin.amos.boot.module.jxiop.biz.activemq.QuerueProduce;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -23,14 +25,13 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.LoginInfoModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
-import org.apache.commons.compress.utils.Lists;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -70,6 +71,14 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
     @Autowired
     QuerueProduce querueProduce;
 
+    @Autowired
+    private AmosFeignService amosFeignService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+
+
     private String UPDATE="UPDATE";
     private String INSERT="INSERT";
     @Autowired
@@ -88,14 +97,38 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         return this.queryForList("", false);
     }
 
+    public void addRedisPostAndCerInfo() {
+        List<DictionarieValueModel> elevatorCategory = null;
+        try {
+            elevatorCategory = amosFeignService.listDictionaryByDictCode("YGZYJNJDZS");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String, String> collect = elevatorCategory.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
+        redisUtils.set(Constants.JXIOP_DICT_POST, collect);
+
+        List<DictionarieValueModel> elevator = null;
+        try {
+            elevator = amosFeignService.listDictionaryByDictCode("岗位资质鉴定证书");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String, String> collect2 = elevator.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
+        redisUtils.set(Constants.JXIOP_DICT_CERTIFICATES, collect2);
+    }
+
     /**
      * 新增
      */
     @Transactional
-    public void addPerson(PersonDto model
-            , HttpServletRequest httpServletRequest
-    ) throws ParseException {
-
+    public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) throws Exception {
+        if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
+            addRedisPostAndCerInfo();
+        }
+        // 岗位所需证书信息
+        Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
+        // 证书临期信息
+        Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
 
         //获取人员基本信息数据
         PersonUser personUser = model.getPersonUser();
@@ -110,7 +143,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         // 该岗位应获得的证书
         List<String> list2 = new ArrayList<>();
         if (StringUtils.isNotEmpty(personUser.getPostName())) {
-            String certificates = QrcodePostEnum.getCode(personUser.getPostName());
+            String certificates = postNameMap.get(personUser.getPostName());
             list2 = Arrays.asList(certificates.split(","));
         }
         List<String> list = new ArrayList(list2);
@@ -119,20 +152,21 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         Integer isOver = 0;
         CertificationInfo personCertificate = model.getPersonCertificate();
 
-        for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-            Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
-            if (list.contains(item.getCertificateName()) &&
-                    DateUtils.dateCompare(date, new Date()) == -1) {
-                isOver = 1;
-            }
-            if (list.contains(item.getCertificateName()) &&
-                    DateUtils.dateBetweenIncludeToday(date, new Date()) < 30 &&
-                    DateUtils.dateCompare(date, new Date()) == 1) {
-                isInMonth = 1;
+        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
+            for (PersonCertificate item : personCertificate.getCertificationInfo()) {
+                Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                if (list.contains(item.getCertificateName()) &&
+                        DateUtils.dateCompare(date, new Date()) == -1) {
+                    isOver = 1;
+                }
+                if (list.contains(item.getCertificateName()) &&
+                        DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) &&
+                        DateUtils.dateCompare(date, new Date()) == 1) {
+                    isInMonth = 1;
+                }
+                list.remove(item.getCertificateName());
             }
-            list.remove(item.getCertificateName());
         }
-
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
             personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
         } else if (CollectionUtils.isEmpty(list) && isOver == 1) {
@@ -233,6 +267,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
     @Transactional
     public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr) throws ParseException {
 
+        if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
+            addRedisPostAndCerInfo();
+        }
+        // 岗位所需证书信息
+        Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
+        // 证书临期信息
+        Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
 
         //获取人员基本信息数据
         PersonUser personUser = model.getPersonUser();
@@ -267,29 +308,29 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         // 该岗位应获得的证书
         List<String> list2 = new ArrayList<>();
         if (StringUtils.isNotEmpty(personUser.getPostName())) {
-            String certificates = QrcodePostEnum.getCode(personUser.getPostName());
+            String certificates = String.valueOf(postNameMap.get(personUser.getPostName()));
             list2 = Arrays.asList(certificates.split(","));
         }
         List<String> list = new ArrayList(list2);
         //人员资质信息
         Integer isInMonth = 0;
         Integer isOver = 0;
-
-        for (PersonCertificate item : personCertificate.getCertificationInfo()) {
-            Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
-            if (list.contains(item.getCertificateName()) &&
-                    DateUtils.dateCompare(date, new Date()) == -1) {
-                isOver = 1;
+        if (CollectionUtils.isNotEmpty(personCertificate.getCertificationInfo())) {
+            for (PersonCertificate item : personCertificate.getCertificationInfo()) {
+                Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                if (list.contains(item.getCertificateName()) &&
+                        DateUtils.dateCompare(date, new Date()) == -1) {
+                    isOver = 1;
+                }
+                if (list.contains(item.getCertificateName()) &&
+                        DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) &&
+                        DateUtils.dateCompare(date, new Date()) == 1) {
+                    isInMonth = 1;
+                }
+                item.setPersonId(personBasic.getSequenceNbr());
+                personCertificateService.save(item);
+                list.remove(item.getCertificateName());
             }
-            if (list.contains(item.getCertificateName()) &&
-                    DateUtils.dateBetweenIncludeToday(date, new Date()) < 30 &&
-                    DateUtils.dateCompare(date, new Date()) == 1) {
-                isInMonth = 1;
-            }
-
-            item.setPersonId(personBasic.getSequenceNbr());
-            personCertificateService.save(item);
-            list.remove(item.getCertificateName());
         }
 
         if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
@@ -300,8 +341,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
         }
         this.personBasicMapper.updateById(personBasic);
-
-
         //人员账号信息
         personAccount.setPersonId(sequenceNbr);
         oldpersonAccount=personAccountService.getById(personAccount.getSequenceNbr());

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jxiop.api.Enum.QrcodeColorEnum;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonCertificate;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonCertificateMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class PersonYardTimeTask {
+
+    @Autowired
+    PersonBasicMapper personBasicMapper;
+
+    @Autowired
+    PersonBasicServiceImpl personBasicService;
+
+    //人员资质信息service
+    @Autowired
+    PersonCertificateMapper personCertificateMapper;
+
+    @Autowired
+    private AmosFeignService amosFeignService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Scheduled(cron = "0 0 0 1/1 * ? ")
+    public void timeYardTimeTask() {
+        if (!redisUtils.hasKey(Constants.JXIOP_DICT_POST) || !redisUtils.hasKey(Constants.JXIOP_DICT_CERTIFICATES)) {
+            personBasicService.addRedisPostAndCerInfo();
+        }
+        // 岗位所需证书信息
+        Map<String, String> postNameMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_POST);
+        // 证书临期信息
+        Map<String, String> certificatesMap = (Map<String, String>) redisUtils.get(Constants.JXIOP_DICT_CERTIFICATES);
+        List<PersonBasic> personBasicList = personBasicMapper.selectList(null);
+
+        List<PersonCertificate> personCertificates = personCertificateMapper.selectList(null);
+
+        Map<Long, List<PersonCertificate>> perCertificateMap = personCertificates.stream().filter(item -> ObjectUtils.isNotEmpty(item.getPersonId())).collect(Collectors.groupingBy(PersonCertificate::getPersonId));
+
+        List<PersonBasic> personBasics = new ArrayList<>();
+        personBasicList.forEach(personBasic -> {
+            List<PersonCertificate> personCertificateList = perCertificateMap.get(personBasic.getSequenceNbr());
+
+            //默认红码
+            personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+            // 该岗位应获得的证书
+            List<String> list2 = new ArrayList<>();
+            if (StringUtils.isNotEmpty(personBasic.getPostName())) {
+                String certificates = String.valueOf(postNameMap.get(personBasic.getPostName()));
+                list2 = Arrays.asList(certificates.split(","));
+            }
+            List<String> list = new ArrayList(list2);
+            //人员资质信息
+            Integer isInMonth = 0;
+            Integer isOver = 0;
+
+            if (CollectionUtils.isNotEmpty(personCertificateList)) {
+                for (PersonCertificate item : personCertificateList) {
+                    Date date = DateUtils.dateAddYears(item.getCertificateTime(), Integer.parseInt(item.getValidPeriod()));
+                    if (list.contains(item.getCertificateName()) &&
+                            DateUtils.dateCompare(date, new Date()) == -1) {
+                        isOver = 1;
+                    }
+                    try {
+                        if (list.contains(item.getCertificateName()) &&
+                                DateUtils.dateBetweenIncludeToday(new Date(), date) < Integer.valueOf(certificatesMap.get(item.getCertificateName())) &&
+                                DateUtils.dateCompare(date, new Date()) == 1) {
+                            isInMonth = 1;
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                    list.remove(item.getCertificateName());
+                }
+            }
+            if (CollectionUtils.isEmpty(list) && isInMonth == 0 && isOver == 0) {
+                personBasic.setQrcodeColor(QrcodeColorEnum.GREEN.getCode());
+            } else if (CollectionUtils.isEmpty(list) && isOver == 1) {
+                personBasic.setQrcodeColor(QrcodeColorEnum.RED.getCode());
+            } else if (CollectionUtils.isEmpty(list) && isOver == 0 && isInMonth == 1) {
+                personBasic.setQrcodeColor(QrcodeColorEnum.YELLOW.getCode());
+            }
+            personBasics.add(personBasic);
+        });
+        personBasicService.updateBatchById(personBasics);
+    }
+}

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

@@ -12,7 +12,6 @@ import com.yeejoin.amos.boot.module.jxiop.api.dto.TreeDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.MonitorFanIndicatorMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
-import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ResultsData;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitorFanIndicatorImpl;

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

-spring.application.name=AMOS-JXIOP-MONITOR
+spring.application.name=AMOS-JXIOP-MONITOR-cz
 server.servlet.context-path=/jxiop-monitor
 server.port=33200
 server.uri-encoding=UTF-8