健康管理功能模块优化与BUG修复

web/health-hb/src/main/java/com/gyee/frame/controller/health/HealthSubController.java

@@ -1,8 +1,13 @@
 package com.gyee.frame.controller.health;
 
+import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.Healthsystem;
+import com.gyee.frame.model.auto.Healthsystemsub;
 import com.gyee.frame.model.custom.*;
+import com.gyee.frame.service.HealthsystemService;
+import com.gyee.frame.service.HealthsystemsubService;
 import com.gyee.frame.service.health.HealthSubService;
 import com.gyee.frame.service.weather.WeatherDay5Service;
 import com.gyee.frame.util.DateUtils;
@@ -12,10 +17,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -32,6 +34,12 @@ public class HealthSubController {
     private WeatherDay5Service weatherDay5Service;
 
 
+    @Resource
+    private HealthsystemService healthsystemService;
+
+    @Resource
+    private HealthsystemsubService healthsystemsubService;
+
     @GetMapping("/findWtHealthInfo")
     @ResponseBody
     @ApiOperation(value = "获取健康管理风机信息", notes = "获取健康管理风机信息")
@@ -492,4 +500,246 @@ public AjaxResult findWtHealthInfo2(String wtId) throws Exception {
 
     }
 
+
+
+    @PostMapping("/healthsystemList")
+    @ResponseBody
+    @ApiOperation(value = "获取健康模型主表列表", notes = "获取健康模型主表列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query")
+    })
+    public AjaxResult healthsystemList(@RequestBody Tablepar tablepar) throws Exception {
+
+        PageInfo<Healthsystem> vos=null;
+
+        if(StringUtils.notEmp(tablepar))
+        {
+            vos=healthsystemService.list(tablepar);
+        }
+
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+
+
+    @PostMapping("/healthsystemDelete")
+    @ResponseBody
+    @ApiOperation(value = "删除健康模型主表对象", notes = "删除健康模型主表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主表Id集合，逗号分隔", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemDelete(String ids) throws Exception {
+
+       Integer result=0;
+
+        if(StringUtils.notEmp(ids))
+        {
+            result=healthsystemService.deleteByPrimaryKey(ids);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+
+    @GetMapping("/healthsystemSelect")
+    @ResponseBody
+    @ApiOperation(value = "通过健康模型主表编号获得对象", notes = "通过健康模型主表编号获得对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主表Id", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemSelect(String id) throws Exception {
+
+        Healthsystem result=null;
+
+        if(StringUtils.notEmp(id))
+        {
+            result=healthsystemService.selectByPrimaryKey(id);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+
+    @PostMapping("/healthsystemUpdate")
+    @ResponseBody
+    @ApiOperation(value = "修改健康模型主表对象", notes = "修改健康模型主表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "主表对象", required = true, dataType = "Healthsystem", paramType = "query")
+    })
+    public AjaxResult healthsystemUpdate(@RequestBody Healthsystem record) throws Exception {
+
+        Integer result=null;
+
+        if(StringUtils.notEmp(record))
+        {
+            result=healthsystemService.updateByPrimaryKeySelective(record);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+
+    @PostMapping("/healthsystemInsert")
+    @ResponseBody
+    @ApiOperation(value = "新增健康模型主表对象", notes = "新增健康模型主表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "主表对象", required = true, dataType = "Healthsystem", paramType = "query")
+    })
+    public AjaxResult healthsystemInsert(@RequestBody Healthsystem record) throws Exception {
+
+        Integer result=null;
+
+        if(StringUtils.notEmp(record))
+        {
+            result=healthsystemService.insertSelective(record);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+
+
+    @PostMapping("/healthsystemsubList")
+    @ResponseBody
+    @ApiOperation(value = "获取健康模型子表列表", notes = "获取健康模型子表列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query")
+    })
+    public AjaxResult healthsystemsubList(@RequestBody Tablepar tablepar) throws Exception {
+
+        PageInfo<Healthsystemsub> vos=null;
+
+        if(StringUtils.notEmp(tablepar))
+        {
+            vos=healthsystemsubService.list(tablepar);
+        }
+
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
+
+
+    @PostMapping("/healthsystemsubDelete")
+    @ResponseBody
+    @ApiOperation(value = "删除健康模型子表对象", notes = "删除健康模型子表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "子表Id集合，逗号分隔", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemsubDelete(String ids) throws Exception {
+
+        Integer result=0;
+
+        if(StringUtils.notEmp(ids))
+        {
+            result=healthsystemsubService.deleteByPrimaryKey(ids);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+
+    @GetMapping("/healthsystemsubSelect")
+    @ResponseBody
+    @ApiOperation(value = "通过健康模型子表编号获得对象", notes = "通过健康模型子表编号获得对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "子表Id", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemsubSelect(String id) throws Exception {
+
+        Healthsystemsub result=null;
+
+        if(StringUtils.notEmp(id))
+        {
+            result=healthsystemsubService.selectByPrimaryKey(id);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+
+    @PostMapping("/healthsystemsubUpdate")
+    @ResponseBody
+    @ApiOperation(value = "修改健康模型子表对象", notes = "修改健康模型子表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "子表对象", required = true, dataType = "Healthsystemsub", paramType = "query")
+    })
+    public AjaxResult healthsystemsubUpdate(@RequestBody Healthsystemsub record) throws Exception {
+
+        Integer result=null;
+
+        if(StringUtils.notEmp(record))
+        {
+            result=healthsystemsubService.updateByPrimaryKeySelective(record);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
+
+    @PostMapping("/healthsystemsubInsert")
+    @ResponseBody
+    @ApiOperation(value = "新增健康模型子表对象", notes = "新增健康模型子表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "子表对象", required = true, dataType = "Healthsystemsub", paramType = "query")
+    })
+    public AjaxResult healthsystemsubInsert(@RequestBody Healthsystemsub record) throws Exception {
+
+        Integer result=null;
+
+        if(StringUtils.notEmp(record))
+        {
+            result=healthsystemsubService.insertSelective(record);
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, result);
+        }
+
+    }
 }

web/health-hb/src/main/java/com/gyee/frame/mapper/auto/HealthsystemMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Healthsystem;
+import com.gyee.frame.model.auto.HealthsystemExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface HealthsystemMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    long countByExample(HealthsystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(HealthsystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int insert(Healthsystem record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Healthsystem record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    List<Healthsystem> selectByExample(HealthsystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    Healthsystem selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Healthsystem record, @Param("example") HealthsystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Healthsystem record, @Param("example") HealthsystemExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Healthsystem record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Healthsystem record);
+}

web/health-hb/src/main/java/com/gyee/frame/mapper/auto/HealthsystemsubMapper.java

@@ -0,0 +1,96 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Healthsystemsub;
+import com.gyee.frame.model.auto.HealthsystemsubExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface HealthsystemsubMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    long countByExample(HealthsystemsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(HealthsystemsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int insert(Healthsystemsub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Healthsystemsub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    List<Healthsystemsub> selectByExample(HealthsystemsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    Healthsystemsub selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Healthsystemsub record, @Param("example") HealthsystemsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Healthsystemsub record, @Param("example") HealthsystemsubExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Healthsystemsub record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Healthsystemsub record);
+}

web/health-hb/src/main/java/com/gyee/frame/model/auto/Healthsystem.java

@@ -0,0 +1,244 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class Healthsystem implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.HCODE
+     *
+     * @mbg.generated
+     */
+    private String hcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.WPID
+     *
+     * @mbg.generated
+     */
+    private String wpid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.STATUS
+     *
+     * @mbg.generated
+     */
+    private String status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.GSTATUS
+     *
+     * @mbg.generated
+     */
+    private String gstatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEM.MODELID
+     *
+     * @mbg.generated
+     */
+    private String modelid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.ID
+     *
+     * @return the value of HEALTHSYSTEM.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.ID
+     *
+     * @param id the value for HEALTHSYSTEM.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.HCODE
+     *
+     * @return the value of HEALTHSYSTEM.HCODE
+     *
+     * @mbg.generated
+     */
+    public String getHcode() {
+        return hcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.HCODE
+     *
+     * @param hcode the value for HEALTHSYSTEM.HCODE
+     *
+     * @mbg.generated
+     */
+    public void setHcode(String hcode) {
+        this.hcode = hcode == null ? null : hcode.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.NAME
+     *
+     * @return the value of HEALTHSYSTEM.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.NAME
+     *
+     * @param name the value for HEALTHSYSTEM.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.WPID
+     *
+     * @return the value of HEALTHSYSTEM.WPID
+     *
+     * @mbg.generated
+     */
+    public String getWpid() {
+        return wpid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.WPID
+     *
+     * @param wpid the value for HEALTHSYSTEM.WPID
+     *
+     * @mbg.generated
+     */
+    public void setWpid(String wpid) {
+        this.wpid = wpid == null ? null : wpid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.STATUS
+     *
+     * @return the value of HEALTHSYSTEM.STATUS
+     *
+     * @mbg.generated
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.STATUS
+     *
+     * @param status the value for HEALTHSYSTEM.STATUS
+     *
+     * @mbg.generated
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.GSTATUS
+     *
+     * @return the value of HEALTHSYSTEM.GSTATUS
+     *
+     * @mbg.generated
+     */
+    public String getGstatus() {
+        return gstatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.GSTATUS
+     *
+     * @param gstatus the value for HEALTHSYSTEM.GSTATUS
+     *
+     * @mbg.generated
+     */
+    public void setGstatus(String gstatus) {
+        this.gstatus = gstatus == null ? null : gstatus.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEM.MODELID
+     *
+     * @return the value of HEALTHSYSTEM.MODELID
+     *
+     * @mbg.generated
+     */
+    public String getModelid() {
+        return modelid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEM.MODELID
+     *
+     * @param modelid the value for HEALTHSYSTEM.MODELID
+     *
+     * @mbg.generated
+     */
+    public void setModelid(String modelid) {
+        this.modelid = modelid == null ? null : modelid.trim();
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/model/auto/HealthsystemExample.java

@@ -0,0 +1,792 @@
+package com.gyee.frame.model.auto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HealthsystemExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public HealthsystemExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeIsNull() {
+            addCriterion("HCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeIsNotNull() {
+            addCriterion("HCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeEqualTo(String value) {
+            addCriterion("HCODE =", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeNotEqualTo(String value) {
+            addCriterion("HCODE <>", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeGreaterThan(String value) {
+            addCriterion("HCODE >", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("HCODE >=", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeLessThan(String value) {
+            addCriterion("HCODE <", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeLessThanOrEqualTo(String value) {
+            addCriterion("HCODE <=", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeLike(String value) {
+            addCriterion("HCODE like", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeNotLike(String value) {
+            addCriterion("HCODE not like", value, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeIn(List<String> values) {
+            addCriterion("HCODE in", values, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeNotIn(List<String> values) {
+            addCriterion("HCODE not in", values, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeBetween(String value1, String value2) {
+            addCriterion("HCODE between", value1, value2, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andHcodeNotBetween(String value1, String value2) {
+            addCriterion("HCODE not between", value1, value2, "hcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNull() {
+            addCriterion("WPID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNotNull() {
+            addCriterion("WPID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidEqualTo(String value) {
+            addCriterion("WPID =", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotEqualTo(String value) {
+            addCriterion("WPID <>", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThan(String value) {
+            addCriterion("WPID >", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThanOrEqualTo(String value) {
+            addCriterion("WPID >=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThan(String value) {
+            addCriterion("WPID <", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThanOrEqualTo(String value) {
+            addCriterion("WPID <=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLike(String value) {
+            addCriterion("WPID like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotLike(String value) {
+            addCriterion("WPID not like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIn(List<String> values) {
+            addCriterion("WPID in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotIn(List<String> values) {
+            addCriterion("WPID not in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidBetween(String value1, String value2) {
+            addCriterion("WPID between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotBetween(String value1, String value2) {
+            addCriterion("WPID not between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("STATUS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("STATUS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("STATUS =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("STATUS <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("STATUS >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("STATUS >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("STATUS <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("STATUS <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("STATUS like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("STATUS not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("STATUS in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("STATUS not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("STATUS between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("STATUS not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusIsNull() {
+            addCriterion("GSTATUS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusIsNotNull() {
+            addCriterion("GSTATUS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusEqualTo(String value) {
+            addCriterion("GSTATUS =", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusNotEqualTo(String value) {
+            addCriterion("GSTATUS <>", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusGreaterThan(String value) {
+            addCriterion("GSTATUS >", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusGreaterThanOrEqualTo(String value) {
+            addCriterion("GSTATUS >=", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusLessThan(String value) {
+            addCriterion("GSTATUS <", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusLessThanOrEqualTo(String value) {
+            addCriterion("GSTATUS <=", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusLike(String value) {
+            addCriterion("GSTATUS like", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusNotLike(String value) {
+            addCriterion("GSTATUS not like", value, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusIn(List<String> values) {
+            addCriterion("GSTATUS in", values, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusNotIn(List<String> values) {
+            addCriterion("GSTATUS not in", values, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusBetween(String value1, String value2) {
+            addCriterion("GSTATUS between", value1, value2, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andGstatusNotBetween(String value1, String value2) {
+            addCriterion("GSTATUS not between", value1, value2, "gstatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNull() {
+            addCriterion("MODELID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIsNotNull() {
+            addCriterion("MODELID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidEqualTo(String value) {
+            addCriterion("MODELID =", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotEqualTo(String value) {
+            addCriterion("MODELID <>", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThan(String value) {
+            addCriterion("MODELID >", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidGreaterThanOrEqualTo(String value) {
+            addCriterion("MODELID >=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThan(String value) {
+            addCriterion("MODELID <", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLessThanOrEqualTo(String value) {
+            addCriterion("MODELID <=", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidLike(String value) {
+            addCriterion("MODELID like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotLike(String value) {
+            addCriterion("MODELID not like", value, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidIn(List<String> values) {
+            addCriterion("MODELID in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotIn(List<String> values) {
+            addCriterion("MODELID not in", values, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidBetween(String value1, String value2) {
+            addCriterion("MODELID between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelidNotBetween(String value1, String value2) {
+            addCriterion("MODELID not between", value1, value2, "modelid");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table HEALTHSYSTEM
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/model/auto/Healthsystemsub.java

@@ -0,0 +1,443 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class Healthsystemsub implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.HID
+     *
+     * @mbg.generated
+     */
+    private String hid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.CODE
+     *
+     * @mbg.generated
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.NAME
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.EXPRESSION
+     *
+     * @mbg.generated
+     */
+    private String expression;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FORMULA
+     *
+     * @mbg.generated
+     */
+    private String formula;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FORMULAMAX
+     *
+     * @mbg.generated
+     */
+    private String formulamax;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FORMULAMIN
+     *
+     * @mbg.generated
+     */
+    private String formulamin;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FORMULASCORE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal formulascore;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FORMULAMAXSCORE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal formulamaxscore;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FORMULAMINSCORE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal formulaminscore;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.FUN
+     *
+     * @mbg.generated
+     */
+    private String fun;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column HEALTHSYSTEMSUB.ORDERBY
+     *
+     * @mbg.generated
+     */
+    private String orderby;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table HEALTHSYSTEMSUB
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.ID
+     *
+     * @return the value of HEALTHSYSTEMSUB.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.ID
+     *
+     * @param id the value for HEALTHSYSTEMSUB.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.HID
+     *
+     * @return the value of HEALTHSYSTEMSUB.HID
+     *
+     * @mbg.generated
+     */
+    public String getHid() {
+        return hid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.HID
+     *
+     * @param hid the value for HEALTHSYSTEMSUB.HID
+     *
+     * @mbg.generated
+     */
+    public void setHid(String hid) {
+        this.hid = hid == null ? null : hid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.CODE
+     *
+     * @return the value of HEALTHSYSTEMSUB.CODE
+     *
+     * @mbg.generated
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.CODE
+     *
+     * @param code the value for HEALTHSYSTEMSUB.CODE
+     *
+     * @mbg.generated
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.NAME
+     *
+     * @return the value of HEALTHSYSTEMSUB.NAME
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.NAME
+     *
+     * @param name the value for HEALTHSYSTEMSUB.NAME
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.EXPRESSION
+     *
+     * @return the value of HEALTHSYSTEMSUB.EXPRESSION
+     *
+     * @mbg.generated
+     */
+    public String getExpression() {
+        return expression;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.EXPRESSION
+     *
+     * @param expression the value for HEALTHSYSTEMSUB.EXPRESSION
+     *
+     * @mbg.generated
+     */
+    public void setExpression(String expression) {
+        this.expression = expression == null ? null : expression.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FORMULA
+     *
+     * @return the value of HEALTHSYSTEMSUB.FORMULA
+     *
+     * @mbg.generated
+     */
+    public String getFormula() {
+        return formula;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FORMULA
+     *
+     * @param formula the value for HEALTHSYSTEMSUB.FORMULA
+     *
+     * @mbg.generated
+     */
+    public void setFormula(String formula) {
+        this.formula = formula == null ? null : formula.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FORMULAMAX
+     *
+     * @return the value of HEALTHSYSTEMSUB.FORMULAMAX
+     *
+     * @mbg.generated
+     */
+    public String getFormulamax() {
+        return formulamax;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FORMULAMAX
+     *
+     * @param formulamax the value for HEALTHSYSTEMSUB.FORMULAMAX
+     *
+     * @mbg.generated
+     */
+    public void setFormulamax(String formulamax) {
+        this.formulamax = formulamax == null ? null : formulamax.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FORMULAMIN
+     *
+     * @return the value of HEALTHSYSTEMSUB.FORMULAMIN
+     *
+     * @mbg.generated
+     */
+    public String getFormulamin() {
+        return formulamin;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FORMULAMIN
+     *
+     * @param formulamin the value for HEALTHSYSTEMSUB.FORMULAMIN
+     *
+     * @mbg.generated
+     */
+    public void setFormulamin(String formulamin) {
+        this.formulamin = formulamin == null ? null : formulamin.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FORMULASCORE
+     *
+     * @return the value of HEALTHSYSTEMSUB.FORMULASCORE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getFormulascore() {
+        return formulascore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FORMULASCORE
+     *
+     * @param formulascore the value for HEALTHSYSTEMSUB.FORMULASCORE
+     *
+     * @mbg.generated
+     */
+    public void setFormulascore(BigDecimal formulascore) {
+        this.formulascore = formulascore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FORMULAMAXSCORE
+     *
+     * @return the value of HEALTHSYSTEMSUB.FORMULAMAXSCORE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getFormulamaxscore() {
+        return formulamaxscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FORMULAMAXSCORE
+     *
+     * @param formulamaxscore the value for HEALTHSYSTEMSUB.FORMULAMAXSCORE
+     *
+     * @mbg.generated
+     */
+    public void setFormulamaxscore(BigDecimal formulamaxscore) {
+        this.formulamaxscore = formulamaxscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FORMULAMINSCORE
+     *
+     * @return the value of HEALTHSYSTEMSUB.FORMULAMINSCORE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getFormulaminscore() {
+        return formulaminscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FORMULAMINSCORE
+     *
+     * @param formulaminscore the value for HEALTHSYSTEMSUB.FORMULAMINSCORE
+     *
+     * @mbg.generated
+     */
+    public void setFormulaminscore(BigDecimal formulaminscore) {
+        this.formulaminscore = formulaminscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.FUN
+     *
+     * @return the value of HEALTHSYSTEMSUB.FUN
+     *
+     * @mbg.generated
+     */
+    public String getFun() {
+        return fun;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.FUN
+     *
+     * @param fun the value for HEALTHSYSTEMSUB.FUN
+     *
+     * @mbg.generated
+     */
+    public void setFun(String fun) {
+        this.fun = fun == null ? null : fun.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column HEALTHSYSTEMSUB.ORDERBY
+     *
+     * @return the value of HEALTHSYSTEMSUB.ORDERBY
+     *
+     * @mbg.generated
+     */
+    public String getOrderby() {
+        return orderby;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column HEALTHSYSTEMSUB.ORDERBY
+     *
+     * @param orderby the value for HEALTHSYSTEMSUB.ORDERBY
+     *
+     * @mbg.generated
+     */
+    public void setOrderby(String orderby) {
+        this.orderby = orderby == null ? null : orderby.trim();
+    }
+}

web/health-hb/src/main/java/com/gyee/frame/service/HealthsystemService.java

@@ -0,0 +1,117 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.HealthsystemMapper;
+import com.gyee.frame.model.auto.Healthsystem;
+import com.gyee.frame.model.auto.HealthsystemExample;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 线路 HealthsystemService
+ * @Title: HealthsystemService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class HealthsystemService implements BaseService<Healthsystem, HealthsystemExample> {
+	@Resource
+	private HealthsystemMapper healthsystemMapper;
+	
+      	   	      	      	      	      	      	      	      	      	      	
+
+	 public PageInfo<Healthsystem> list(Tablepar tablepar){
+	        HealthsystemExample testExample=new HealthsystemExample();
+	        testExample.setOrderByClause("id ASC");
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<Healthsystem> list= healthsystemMapper.selectByExample(testExample);
+	        PageInfo<Healthsystem> pageInfo = new PageInfo<Healthsystem>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			HealthsystemExample example=new HealthsystemExample();
+			example.createCriteria().andIdIn(lista);
+			return healthsystemMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Healthsystem selectByPrimaryKey(String id) {
+				
+			return healthsystemMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Healthsystem record) {
+		return healthsystemMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Healthsystem record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return healthsystemMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Healthsystem record, HealthsystemExample example) {
+		
+		return healthsystemMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Healthsystem record, HealthsystemExample example) {
+		
+		return healthsystemMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Healthsystem> selectByExample(HealthsystemExample example) {
+		
+		return healthsystemMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(HealthsystemExample example) {
+		
+		return healthsystemMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(HealthsystemExample example) {
+		
+		return healthsystemMapper.deleteByExample(example);
+	}
+	
+
+
+}

web/health-hb/src/main/java/com/gyee/frame/service/HealthsystemsubService.java

@@ -0,0 +1,118 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.HealthsystemsubMapper;
+import com.gyee.frame.model.auto.Healthsystemsub;
+import com.gyee.frame.model.auto.HealthsystemsubExample;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.util.SnowflakeIdWorker;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 线路 HealthsystemsubService
+ * @Title: HealthsystemsubService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class HealthsystemsubService implements BaseService<Healthsystemsub, HealthsystemsubExample> {
+	@Resource
+	private HealthsystemsubMapper healthsystemsubMapper;
+	
+      	   	      	      	      	      	      	      	      	      	      	
+
+	 public PageInfo<Healthsystemsub> list(Tablepar tablepar){
+	        HealthsystemsubExample testExample=new HealthsystemsubExample();
+	        testExample.setOrderByClause("id ASC");
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<Healthsystemsub> list= healthsystemsubMapper.selectByExample(testExample);
+	        PageInfo<Healthsystemsub> pageInfo = new PageInfo<Healthsystemsub>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			HealthsystemsubExample example=new HealthsystemsubExample();
+			example.createCriteria().andIdIn(lista);
+			return healthsystemsubMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Healthsystemsub selectByPrimaryKey(String id) {
+				
+			return healthsystemsubMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Healthsystemsub record) {
+		return healthsystemsubMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Healthsystemsub record) {
+				
+		//添加雪花主键id
+		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return healthsystemsubMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Healthsystemsub record, HealthsystemsubExample example) {
+		
+		return healthsystemsubMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Healthsystemsub record, HealthsystemsubExample example) {
+		
+		return healthsystemsubMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Healthsystemsub> selectByExample(HealthsystemsubExample example) {
+		
+		return healthsystemsubMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(HealthsystemsubExample example) {
+		
+		return healthsystemsubMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(HealthsystemsubExample example) {
+		
+		return healthsystemsubMapper.deleteByExample(example);
+	}
+	
+
+
+
+}

web/health-hb/src/main/java/com/gyee/frame/service/health/HealthMainService.java

@@ -405,7 +405,7 @@ public class HealthMainService {
 
                 for (Windturbine wt : wtls) {
                     wtidls.add(wt.getId());
-                    codejkls.add(Constant.FJJKZZ);
+                    codejkls.add(Constant.FJJKZT);
                     codeztls.add(Constant.FJZT);
                 }
 
@@ -501,11 +501,11 @@ public class HealthMainService {
                         gzIdLs.add(vo);
                         csl++;
                     } else {
-                        if (jk >= 60) {
+                        if (jk ==1) {
 
                             ysl++;
 
-                        } else if (jk < 60 && jk >= 30) {
+                        } else if (jk ==2 || jk ==3) {
                             lsl++;
                         } else {
 
@@ -514,8 +514,8 @@ public class HealthMainService {
                             if(InitialRunner.wtmap.containsKey(wtId))
                             {
                                 Windturbine wt=InitialRunner.wtmap.get(wtId);
-                                if (StringUtils.notEmp(wt.getStatus())) {
-                                    String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                                if (StringUtils.notEmp(wt.getId())) {
+                                    String num = wt.getId().substring(wt.getId().indexOf("_")+1);
                                     vo.setName(num);
 
                                 }
@@ -691,50 +691,50 @@ public class HealthMainService {
                 cal.set(Calendar.HOUR_OF_DAY, 0);
                 endDate = cal.getTime();
 
-                List<Weatherfd> wfdls = weatherfdService.findWeatherfd(beginDate, endDate, wpId);
-
-                if (!wfdls.isEmpty()) {
-                    Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
-
-                    for (Weatherfd wd : wfdls) {
-                        if (speedmap.containsKey(wd.getSpeed1())) {
-                            int temp = speedmap.get(wd.getSpeed1()) + 1;
-                            speedmap.put(wd.getSpeed1(), temp);
-                        } else {
-                            speedmap.put(wd.getSpeed1(), 1);
-                        }
-                        if (speedmap.containsKey(wd.getSpeed2())) {
-                            int temp = speedmap.get(wd.getSpeed2()) + 1;
-                            speedmap.put(wd.getSpeed2(), temp);
-                        } else {
-                            speedmap.put(wd.getSpeed2(), 1);
-                        }
-
-                    }
-
-                    //ycdl1month = powerToPowerService.getPowerByWp(speedmap, wpId, 24);
-                    //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
-                    cal = Calendar.getInstance();
-                    cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
-                    int daynum = cal.get(Calendar.DAY_OF_MONTH);
-                    cal = Calendar.getInstance();
-                    ycdl1month = StringUtils.round((yfdl + ycdl1day*(daynum-cal.get(Calendar.DAY_OF_MONTH)))*YCFDLXS, 2);
-
-
-                    if(yfdljh!=0)
-                    {
-                        //与月计划发电量结合判断月预测发电量
-                        if(ycdl1month<yfdljh)
-                        {
-                            ycdl1month=yfdljh*1.05;
-
-                        }else if(ycdl1month>(yfdljh*1.2))
-                        {
-                            ycdl1month=yfdljh*1.2;
-                        }
-                    }
-
-                }
+//                List<Weatherfd> wfdls = weatherfdService.findWeatherfd(beginDate, endDate, wpId);
+//
+//                if (!wfdls.isEmpty()) {
+//                    Map<Double, Integer> speedmap = new HashMap<Double, Integer>();
+//
+//                    for (Weatherfd wd : wfdls) {
+//                        if (speedmap.containsKey(wd.getSpeed1())) {
+//                            int temp = speedmap.get(wd.getSpeed1()) + 1;
+//                            speedmap.put(wd.getSpeed1(), temp);
+//                        } else {
+//                            speedmap.put(wd.getSpeed1(), 1);
+//                        }
+//                        if (speedmap.containsKey(wd.getSpeed2())) {
+//                            int temp = speedmap.get(wd.getSpeed2()) + 1;
+//                            speedmap.put(wd.getSpeed2(), temp);
+//                        } else {
+//                            speedmap.put(wd.getSpeed2(), 1);
+//                        }
+//
+//                    }
+//
+//                    //ycdl1month = powerToPowerService.getPowerByWp(speedmap, wpId, 24);
+//                    //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
+//                    cal = Calendar.getInstance();
+//                    cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+//                    int daynum = cal.get(Calendar.DAY_OF_MONTH);
+//                    cal = Calendar.getInstance();
+//                    ycdl1month = StringUtils.round((yfdl + ycdl1day*(daynum-cal.get(Calendar.DAY_OF_MONTH)))*YCFDLXS, 2);
+//
+//
+//                    if(yfdljh!=0)
+//                    {
+//                        //与月计划发电量结合判断月预测发电量
+//                        if(ycdl1month<yfdljh)
+//                        {
+//                            ycdl1month=yfdljh*1.05;
+//
+//                        }else if(ycdl1month>(yfdljh*1.2))
+//                        {
+//                            ycdl1month=yfdljh*1.2;
+//                        }
+//                    }
+//
+//                }
 
                 if (ycdl1day != 0.0) {
                     yczqlday = new BigDecimal(rfdl).divide(new BigDecimal(ycdl1day), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
@@ -752,7 +752,7 @@ public class HealthMainService {
                 for (Windturbine wt : wtls) {
 
                     wtidls.add(wt.getId());
-                    codejkls.add(Constant.FJJKZZ);
+                    codejkls.add(Constant.FJJKZT);
                     codeztls.add(Constant.FJZT);
 
                 }
@@ -837,8 +837,8 @@ public class HealthMainService {
                         if(InitialRunner.wtmap.containsKey(wtId))
                         {
                             Windturbine wt=InitialRunner.wtmap.get(wtId);
-                            if (StringUtils.notEmp(wt.getStatus())) {
-                                String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                            if (StringUtils.notEmp(wt.getId())) {
+                                String num = wt.getId().substring(wt.getId().indexOf("_")+1);
                                 str[2] = num;
 
                             }
@@ -847,12 +847,12 @@ public class HealthMainService {
                         csl++;
                     } else {
                         String[] str = new String[3];
-                        if (jk >= 60) {
+                        if (jk == 1) {
                             str[0] = wtId;
                             str[1] = "1";
                             wtIdls.add(str);
                             ysl++;
-                        } else if (jk < 60 && jk >= 30) {
+                        } else if (jk ==2 || jk == 3) {
                             str[0] = wtId;
                             str[1] = "2";
                             wtIdls.add(str);
@@ -866,22 +866,22 @@ public class HealthMainService {
                         if(InitialRunner.wtmap.containsKey(wtId))
                         {
                             Windturbine wt=InitialRunner.wtmap.get(wtId);
-                            if (StringUtils.notEmp(wt.getStatus())) {
-                                String num = wt.getStatus().substring(wt.getStatus().length() - 3);
+                            if (StringUtils.notEmp(wt.getId())) {
+                                String num = wt.getId().substring(wt.getId().indexOf("_")+1);
                                 str[2] = num;
 
                             }
                         }
-                        if (jk >= 80) {
+                        if (jk == 1) {
 
                             sl1++;
-                        } else if (jk < 80 && jk >= 60) {
+                        } else if (jk == 2) {
 
                             sl2++;
-                        }else if (jk < 60 && jk >= 40) {
+                        }else if (jk== 3) {
 
                             sl3++;
-                        }else if (jk < 40 && jk >= 30) {
+                        }else if (jk== 4) {
 
                             sl4++;
                         } else {

web/health-hb/src/main/resources/application-hbn.yml

@@ -0,0 +1,212 @@
+# 项目相关配置
+gyee:
+  #名称
+  name: v2
+  #版本
+  version: 3.9
+  #版权年份
+  copyrightYear: 2020
+  #文件上传路径
+  defaultBaseDir: D:/v2file/
+  #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。  为N存放在D:/v2file/ 前端读取相同，不受影响
+  isstatic: Y
+  #开启存放静态文件夹后目录
+  isroot_dir: static/file_upload/
+  #邮件功能
+  #邮箱发送smtp
+  email_smtp: smtp.sina.com
+  #邮箱发送端口
+  email_port: 465
+  #发送邮箱登录账号
+  email_account: gyee@163.com
+  #发送邮箱登录密码
+  email_password: 1
+  #实例演示开关 启动该模式删除增加修改会弹出演示模式提示框
+  demoEnabled: false
+  #漂亮得拖动验证码 默认false普通验证码、true滚动验证码
+  rollVerification: true
+  #实时数据库Url
+  baseurl: http://10.83.68.96:8011/ts
+  healthurl: http://10.83.68.96:8012/ts
+  adapterUrl: http://10.83.68.96:8011
+  alarmUrl: http://10.83.68.96:8176
+  #API访问ip
+  #swaggerip: 49.4.50.80:8082
+  swaggerip: 10.83.68.96:8082
+  #默认小数位数
+  digit: 2
+  realtimedataBase: golden #数据查询模式 golden、hwy
+  weatherurl: http://10.83.68.96:7011
+  weatherqygs: hb_qygs
+  hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
+  initialcode: INITIAL
+#tomcat config
+server :
+  port : 8172
+  session:
+    timeout: 7200
+  ##项目名字配置
+  #servlet :
+  #  context-path : /demo
+  tomcat :
+    maxHttpHeaderSize : 8192
+    max-threads : 128
+    min-spare-threads : 5
+    uri-encoding : UTF-8
+    #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-form-post-size: 9000000
+#dev环境  mysql7.0
+spring :
+  application:
+#    name: monitor-hb-provider
+#    cloud:
+#      nacos:
+#        discovery:
+#          server-addr: 10.83.68.96:8848
+#          #指定yaml格式的配置
+#          file-extension: yaml
+#          cluster-name: master
+#        username: nacos
+#        password: nacos
+    #引入其他配置文件，例如ftpHX 未配置文件application-ftpHX.yml
+    #include: ftpHX,ftpCloud
+  servlet:
+    multipart:
+      #设置总上传的数据大小
+      max-request-size: 100MB
+      #单个文件大小
+      maxFileSize : 30MB
+      #shiro 报错修改的地方
+    max-connections: 200000
+    max-http-post-size: 9000000
+  #热部署模块
+  devtools:
+    restart:
+      #热部署开关
+      enabled: true
+      #指定热部署的目录
+      additional-paths: src/main/java
+      #指定目录不更新
+      exclude: test/**
+
+  redis:
+    database: 19
+    host: 10.83.68.94
+    password:
+    pool:
+      maxTotal: 20
+      maxIdle: 20
+      maxwait: 600000
+      minIdle: 10
+    port: 6379
+    timeout: 600000
+  datasource:
+    #type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
+    #    driverClassName: com.mysql.jdbc.Driver
+    #druid连接池配置
+    druid:
+      #主库数据源
+      master:
+        url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+        username: gdprod
+        password: gd123
+        driver-class-name: oracle.jdbc.driver.OracleDriver
+      #备数据源 #关闭
+      slave:
+        enabled: false
+        url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
+        username: root
+        password: root
+        #两票数据源
+      ticket:
+        url: jdbc:sqlserver://10.83.68.98:1434;DatabaseName=fdeamnew
+
+        username: sa
+        password: ibs
+        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #配置初始化连接数大小
+      initial-size: 10
+      # 最大连接数
+      max-active: 50
+      #最小连接数
+      min-idle: 10
+      #获取连接等待超时时间
+      max-wait: 5000
+      pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+      max-pool-prepared-statement-per-connection-size: 20
+      validation-query: SELECT 1 FROM DUAL
+      validation-query-timeout: 20000
+      test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+      test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+      time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+      #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #可以增加访问账号密码【去掉注释就可以】
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+
+#mysql 8.0
+
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driverClassName: com.mysql.cj.jdbc.Driver
+#    #druid连接池配置
+#    druid:
+#     # 主库数据源
+#     master:
+#        url: jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #树熊数据源
+#     slave:
+#        enabled : false
+#        url: jdbc:mysql://localhost:3306/test2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT&autoReconnect=true&useSSL=false
+#        username: root
+#        password: root
+#        #配置初始化连接数大小
+#     initial-size: 10
+#     # 最大连接数
+#     max-active: 50
+#     #最小连接数
+#     min-idle: 10
+#     #获取连接等待超时时间
+#     max-wait: 5000
+#     pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。
+#     max-pool-prepared-statement-per-connection-size: 20
+#     validation-query: SELECT 1 FROM DUAL
+#     validation-query-timeout: 20000
+#     test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。
+#     test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。
+#     time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+#     min-evictable-idle-time-millis: 300000  #一个连接在池中最小生存的时间，单位是毫秒
+#     #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定）
+#     stat-view-servlet:
+#      enabled: true
+#      url-pattern: /druid/*
+#      #可以增加访问账号密码【去掉注释就可以】
+#      #login-username: admin
+#      #login-password: admin
+#     filter:
+#      stat:
+#        log-slow-sql: true
+#        slow-sql-millis: 1000
+#        merge-sql: true
+#      wall:
+#        config:
+#          multi-statement-allow: true

web/health-hb/src/main/resources/mybatis-generator.xml

@@ -51,19 +51,19 @@
 <!--                userId="root"-->
 <!--                password="123456">-->
 <!--        </jdbcConnection>-->
-<!--        <jdbcConnection-->
-<!--                driverClass="oracle.jdbc.driver.OracleDriver"-->
-<!--                connectionURL="jdbc:oracle:thin:@10.0.118.71:1521:gdsj"-->
-<!--                userId="gdprod"-->
-<!--                password="gd123">-->
-<!--        </jdbcConnection>-->
+        <jdbcConnection
+                driverClass="oracle.jdbc.driver.OracleDriver"
+                connectionURL="jdbc:oracle:thin:@10.83.68.165:1521:gdsj"
+                userId="gdprod"
+                password="gd123">
+        </jdbcConnection>
 
-                <jdbcConnection
-                        driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver"
-                        connectionURL="jdbc:sqlserver://123.60.213.70:1433;DatabaseName=fdeam"
-                        userId="sa"
-                        password="Gyee@321#!">
-                </jdbcConnection>
+<!--                <jdbcConnection-->
+<!--                        driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver"-->
+<!--                        connectionURL="jdbc:sqlserver://123.60.213.70:1433;DatabaseName=fdeam"-->
+<!--                        userId="sa"-->
+<!--                        password="Gyee@321#!">-->
+<!--                </jdbcConnection>-->
         <javaTypeResolver>
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
@@ -110,8 +110,8 @@
 <!--        <table tableName='StopAnalysismain' domainObjectName='StopAnalysismain'/>-->
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
-        <table tableName='Inventory' domainObjectName='Inventory'/>
-
+        <table tableName='Healthsystem' domainObjectName='Healthsystem'/>
+        <table tableName='Healthsystemsub' domainObjectName='Healthsystemsub'/>
 
     </context>
 </generatorConfiguration>

web/health-hb/src/main/resources/mybatis/auto/HealthsystemMapper.xml

@@ -0,0 +1,303 @@
+<?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.gyee.frame.mapper.auto.HealthsystemMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Healthsystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="HCODE" jdbcType="VARCHAR" property="hcode" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="WPID" jdbcType="VARCHAR" property="wpid" />
+    <result column="STATUS" jdbcType="VARCHAR" property="status" />
+    <result column="GSTATUS" jdbcType="VARCHAR" property="gstatus" />
+    <result column="MODELID" jdbcType="VARCHAR" property="modelid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, HCODE, NAME, WPID, STATUS, GSTATUS, MODELID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.HealthsystemExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from HEALTHSYSTEM
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from HEALTHSYSTEM
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from HEALTHSYSTEM
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.HealthsystemExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from HEALTHSYSTEM
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Healthsystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into HEALTHSYSTEM (ID, HCODE, NAME, 
+      WPID, STATUS, GSTATUS, 
+      MODELID)
+    values (#{id,jdbcType=VARCHAR}, #{hcode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{wpid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{gstatus,jdbcType=VARCHAR}, 
+      #{modelid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Healthsystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into HEALTHSYSTEM
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="hcode != null">
+        HCODE,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="wpid != null">
+        WPID,
+      </if>
+      <if test="status != null">
+        STATUS,
+      </if>
+      <if test="gstatus != null">
+        GSTATUS,
+      </if>
+      <if test="modelid != null">
+        MODELID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="hcode != null">
+        #{hcode,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="wpid != null">
+        #{wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="gstatus != null">
+        #{gstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        #{modelid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.HealthsystemExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from HEALTHSYSTEM
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEM
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hcode != null">
+        HCODE = #{record.hcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wpid != null">
+        WPID = #{record.wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        STATUS = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gstatus != null">
+        GSTATUS = #{record.gstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelid != null">
+        MODELID = #{record.modelid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEM
+    set ID = #{record.id,jdbcType=VARCHAR},
+      HCODE = #{record.hcode,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      WPID = #{record.wpid,jdbcType=VARCHAR},
+      STATUS = #{record.status,jdbcType=VARCHAR},
+      GSTATUS = #{record.gstatus,jdbcType=VARCHAR},
+      MODELID = #{record.modelid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Healthsystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEM
+    <set>
+      <if test="hcode != null">
+        HCODE = #{hcode,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="wpid != null">
+        WPID = #{wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        STATUS = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="gstatus != null">
+        GSTATUS = #{gstatus,jdbcType=VARCHAR},
+      </if>
+      <if test="modelid != null">
+        MODELID = #{modelid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Healthsystem">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEM
+    set HCODE = #{hcode,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      WPID = #{wpid,jdbcType=VARCHAR},
+      STATUS = #{status,jdbcType=VARCHAR},
+      GSTATUS = #{gstatus,jdbcType=VARCHAR},
+      MODELID = #{modelid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/health-hb/src/main/resources/mybatis/auto/HealthsystemsubMapper.xml

@@ -0,0 +1,398 @@
+<?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.gyee.frame.mapper.auto.HealthsystemsubMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Healthsystemsub">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="HID" jdbcType="VARCHAR" property="hid" />
+    <result column="CODE" jdbcType="VARCHAR" property="code" />
+    <result column="NAME" jdbcType="VARCHAR" property="name" />
+    <result column="EXPRESSION" jdbcType="VARCHAR" property="expression" />
+    <result column="FORMULA" jdbcType="VARCHAR" property="formula" />
+    <result column="FORMULAMAX" jdbcType="VARCHAR" property="formulamax" />
+    <result column="FORMULAMIN" jdbcType="VARCHAR" property="formulamin" />
+    <result column="FORMULASCORE" jdbcType="DECIMAL" property="formulascore" />
+    <result column="FORMULAMAXSCORE" jdbcType="DECIMAL" property="formulamaxscore" />
+    <result column="FORMULAMINSCORE" jdbcType="DECIMAL" property="formulaminscore" />
+    <result column="FUN" jdbcType="VARCHAR" property="fun" />
+    <result column="ORDERBY" jdbcType="VARCHAR" property="orderby" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, HID, CODE, NAME, EXPRESSION, FORMULA, FORMULAMAX, FORMULAMIN, FORMULASCORE, FORMULAMAXSCORE, 
+    FORMULAMINSCORE, FUN, ORDERBY
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.HealthsystemsubExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from HEALTHSYSTEMSUB
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from HEALTHSYSTEMSUB
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from HEALTHSYSTEMSUB
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.HealthsystemsubExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from HEALTHSYSTEMSUB
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Healthsystemsub">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into HEALTHSYSTEMSUB (ID, HID, CODE, 
+      NAME, EXPRESSION, FORMULA, 
+      FORMULAMAX, FORMULAMIN, FORMULASCORE, 
+      FORMULAMAXSCORE, FORMULAMINSCORE, FUN, 
+      ORDERBY)
+    values (#{id,jdbcType=VARCHAR}, #{hid,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{expression,jdbcType=VARCHAR}, #{formula,jdbcType=VARCHAR}, 
+      #{formulamax,jdbcType=VARCHAR}, #{formulamin,jdbcType=VARCHAR}, #{formulascore,jdbcType=DECIMAL}, 
+      #{formulamaxscore,jdbcType=DECIMAL}, #{formulaminscore,jdbcType=DECIMAL}, #{fun,jdbcType=VARCHAR}, 
+      #{orderby,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Healthsystemsub">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into HEALTHSYSTEMSUB
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="hid != null">
+        HID,
+      </if>
+      <if test="code != null">
+        CODE,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="expression != null">
+        EXPRESSION,
+      </if>
+      <if test="formula != null">
+        FORMULA,
+      </if>
+      <if test="formulamax != null">
+        FORMULAMAX,
+      </if>
+      <if test="formulamin != null">
+        FORMULAMIN,
+      </if>
+      <if test="formulascore != null">
+        FORMULASCORE,
+      </if>
+      <if test="formulamaxscore != null">
+        FORMULAMAXSCORE,
+      </if>
+      <if test="formulaminscore != null">
+        FORMULAMINSCORE,
+      </if>
+      <if test="fun != null">
+        FUN,
+      </if>
+      <if test="orderby != null">
+        ORDERBY,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="hid != null">
+        #{hid,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="expression != null">
+        #{expression,jdbcType=VARCHAR},
+      </if>
+      <if test="formula != null">
+        #{formula,jdbcType=VARCHAR},
+      </if>
+      <if test="formulamax != null">
+        #{formulamax,jdbcType=VARCHAR},
+      </if>
+      <if test="formulamin != null">
+        #{formulamin,jdbcType=VARCHAR},
+      </if>
+      <if test="formulascore != null">
+        #{formulascore,jdbcType=DECIMAL},
+      </if>
+      <if test="formulamaxscore != null">
+        #{formulamaxscore,jdbcType=DECIMAL},
+      </if>
+      <if test="formulaminscore != null">
+        #{formulaminscore,jdbcType=DECIMAL},
+      </if>
+      <if test="fun != null">
+        #{fun,jdbcType=VARCHAR},
+      </if>
+      <if test="orderby != null">
+        #{orderby,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.HealthsystemsubExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from HEALTHSYSTEMSUB
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEMSUB
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hid != null">
+        HID = #{record.hid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.code != null">
+        CODE = #{record.code,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.expression != null">
+        EXPRESSION = #{record.expression,jdbcType=VARCHAR},
+      </if>
+      <if test="record.formula != null">
+        FORMULA = #{record.formula,jdbcType=VARCHAR},
+      </if>
+      <if test="record.formulamax != null">
+        FORMULAMAX = #{record.formulamax,jdbcType=VARCHAR},
+      </if>
+      <if test="record.formulamin != null">
+        FORMULAMIN = #{record.formulamin,jdbcType=VARCHAR},
+      </if>
+      <if test="record.formulascore != null">
+        FORMULASCORE = #{record.formulascore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.formulamaxscore != null">
+        FORMULAMAXSCORE = #{record.formulamaxscore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.formulaminscore != null">
+        FORMULAMINSCORE = #{record.formulaminscore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.fun != null">
+        FUN = #{record.fun,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderby != null">
+        ORDERBY = #{record.orderby,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEMSUB
+    set ID = #{record.id,jdbcType=VARCHAR},
+      HID = #{record.hid,jdbcType=VARCHAR},
+      CODE = #{record.code,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      EXPRESSION = #{record.expression,jdbcType=VARCHAR},
+      FORMULA = #{record.formula,jdbcType=VARCHAR},
+      FORMULAMAX = #{record.formulamax,jdbcType=VARCHAR},
+      FORMULAMIN = #{record.formulamin,jdbcType=VARCHAR},
+      FORMULASCORE = #{record.formulascore,jdbcType=DECIMAL},
+      FORMULAMAXSCORE = #{record.formulamaxscore,jdbcType=DECIMAL},
+      FORMULAMINSCORE = #{record.formulaminscore,jdbcType=DECIMAL},
+      FUN = #{record.fun,jdbcType=VARCHAR},
+      ORDERBY = #{record.orderby,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Healthsystemsub">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEMSUB
+    <set>
+      <if test="hid != null">
+        HID = #{hid,jdbcType=VARCHAR},
+      </if>
+      <if test="code != null">
+        CODE = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="expression != null">
+        EXPRESSION = #{expression,jdbcType=VARCHAR},
+      </if>
+      <if test="formula != null">
+        FORMULA = #{formula,jdbcType=VARCHAR},
+      </if>
+      <if test="formulamax != null">
+        FORMULAMAX = #{formulamax,jdbcType=VARCHAR},
+      </if>
+      <if test="formulamin != null">
+        FORMULAMIN = #{formulamin,jdbcType=VARCHAR},
+      </if>
+      <if test="formulascore != null">
+        FORMULASCORE = #{formulascore,jdbcType=DECIMAL},
+      </if>
+      <if test="formulamaxscore != null">
+        FORMULAMAXSCORE = #{formulamaxscore,jdbcType=DECIMAL},
+      </if>
+      <if test="formulaminscore != null">
+        FORMULAMINSCORE = #{formulaminscore,jdbcType=DECIMAL},
+      </if>
+      <if test="fun != null">
+        FUN = #{fun,jdbcType=VARCHAR},
+      </if>
+      <if test="orderby != null">
+        ORDERBY = #{orderby,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Healthsystemsub">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update HEALTHSYSTEMSUB
+    set HID = #{hid,jdbcType=VARCHAR},
+      CODE = #{code,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      EXPRESSION = #{expression,jdbcType=VARCHAR},
+      FORMULA = #{formula,jdbcType=VARCHAR},
+      FORMULAMAX = #{formulamax,jdbcType=VARCHAR},
+      FORMULAMIN = #{formulamin,jdbcType=VARCHAR},
+      FORMULASCORE = #{formulascore,jdbcType=DECIMAL},
+      FORMULAMAXSCORE = #{formulamaxscore,jdbcType=DECIMAL},
+      FORMULAMINSCORE = #{formulaminscore,jdbcType=DECIMAL},
+      FUN = #{fun,jdbcType=VARCHAR},
+      ORDERBY = #{orderby,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

web/health-hb/src/main/resources/mybatis/auto/ShutdowneventMapper.xml

@@ -516,13 +516,10 @@
     and t.stoptime <= (select max(stoptime) from shutdownevent) and t.windturbineid = t1.id group by t1.projectid  order by t1.projectid
   </select>
 
-
     <select id="queryEvents"  resultType="com.gyee.frame.model.custom.ShutdowneventVo">
-        select t.id,t.windPowerStationId,t.windTurbineId,s.warningId,s.alerttext warnDesc,t.stopTime,t.startTime,t.stopHours,t.lossPower,t.statusCode
-         from shutdownevent t inner join (select n.alerttext,w.faulttime,n.windturbineid,n.stationid warningId  from faulthistory w
-          inner join faultsnap n on n.id=w.snapid  where w.faulttime >=#{beginDate}
-          and  w.faulttime &lt;=#{endDate} and w.messagetype=1) s on
-           s.windturbineid=t.windturbineid
+        select t.id,t.windPowerStationId,t.windTurbineId,t.warningid,s.chinesetext warnDesc,t.stopTime,t.startTime,t.stopHours,t.lossPower,t.statusCode
+        from shutdownevent t left join warning2 s on
+        t.warningid=s.id
           where t.stopTime>=#{beginDate}
            and t.stopTime&lt;=#{endDate}
            and t.statusCode=2