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

web/consumer-hb/src/main/java/com/gyee/consumer/controller/health/HealthController.java

@@ -2,6 +2,8 @@ package com.gyee.consumer.controller.health;
 
 
 import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Healthsystem;
+import com.gyee.consumer.model.Healthsystemsub;
 import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.health.HealthService;
 import io.swagger.annotations.Api;
@@ -507,7 +509,144 @@ public class HealthController {
     }
     /***********************************************************************************************************************/
 
+    @PostMapping("/healthsystemList")
+    @ResponseBody
+    @ApiOperation(value = "获取健康模型主表列表", notes = "获取健康模型主表列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query")
+    })
+    public AjaxResult healthsystemList(Tablepar tablepar) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemList(tablepar);
+
+        return ajax;
+    }
+
+    @PostMapping("/healthsystemDelete")
+    @ResponseBody
+    @ApiOperation(value = "删除健康模型主表对象", notes = "删除健康模型主表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "主表Id集合，逗号分隔", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemDelete(@RequestParam("ids") String ids) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemDelete(ids);
+
+        return ajax;
+    }
+
+
+
+    @GetMapping("/healthsystemSelect")
+    @ResponseBody
+    @ApiOperation(value = "通过健康模型主表编号获得对象", notes = "通过健康模型主表编号获得对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主表Id", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemSelect(@RequestParam("id") String id) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemSelect(id);
+
+        return ajax;
+    }
+
+
+    @PostMapping("/healthsystemUpdate")
+    @ResponseBody
+    @ApiOperation(value = "修改健康模型主表对象", notes = "修改健康模型主表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "主表对象", required = true, dataType = "Healthsystem", paramType = "query")
+    })
+    public AjaxResult healthsystemUpdate(Healthsystem record) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemUpdate(record);
+
+        return ajax;
+    }
+
+
+    @PostMapping("/healthsystemInsert")
+    @ResponseBody
+    @ApiOperation(value = "新增健康模型主表对象", notes = "新增健康模型主表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "主表对象", required = true, dataType = "Healthsystem", paramType = "query")
+    })
+    public AjaxResult healthsystemInsert(Healthsystem record) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemInsert(record);
+
+        return ajax;
+    }
+
 
 
+    @PostMapping("/healthsystemsubList")
+    @ResponseBody
+    @ApiOperation(value = "获取健康模型子表列表", notes = "获取健康模型子表列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象", required = true, dataType = "tablepar", paramType = "query")
+    })
+    public AjaxResult healthsystemsubList(Tablepar tablepar) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemsubList(tablepar);
+
+        return ajax;
+    }
+
+
+    @PostMapping("/healthsystemsubDelete")
+    @ResponseBody
+    @ApiOperation(value = "删除健康模型子表对象", notes = "删除健康模型子表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "子表Id集合，逗号分隔", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemsubDelete(@RequestParam("ids") String ids) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemsubDelete(ids);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/healthsystemsubSelect")
+    @ResponseBody
+    @ApiOperation(value = "通过健康模型子表编号获得对象", notes = "通过健康模型子表编号获得对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "子表Id", required = true, dataType = "String", paramType = "query")
+    })
+    public AjaxResult healthsystemsubSelect(@RequestParam("id") String id) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemsubSelect(id);
+
+        return ajax;
+    }
+
+
+    @PostMapping("/healthsystemsubUpdate")
+    @ResponseBody
+    @ApiOperation(value = "修改健康模型子表对象", notes = "修改健康模型子表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "子表对象", required = true, dataType = "Healthsystemsub", paramType = "query")
+    })
+    public AjaxResult healthsystemsubUpdate(Healthsystemsub record) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemsubUpdate(record);
+
+        return ajax;
+    }
+
+    @PostMapping("/healthsystemsubInsert")
+    @ResponseBody
+    @ApiOperation(value = "新增健康模型子表对象", notes = "新增健康模型子表对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "record", value = "子表对象", required = true, dataType = "Healthsystemsub", paramType = "query")
+    })
+    public AjaxResult healthsystemsubInsert(Healthsystemsub record) throws Exception {
+
+        AjaxResult ajax = healthMainService.healthsystemsubInsert(record);
+
+        return ajax;
+    }
+
 
 }

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/health/HealthServiceFallbackFactory.java

@@ -1,6 +1,8 @@
 package com.gyee.consumer.fallback.health;
 
 import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Healthsystem;
+import com.gyee.consumer.model.Healthsystemsub;
 import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.health.HealthService;
 import feign.hystrix.FallbackFactory;
@@ -12,211 +14,265 @@ public class HealthServiceFallbackFactory implements FallbackFactory<HealthServi
     public HealthService create(Throwable throwable) {
         return new HealthService() {
 
-    /***********************************************************************************************************************/
-    @Override
-    public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception{
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findAllMap() throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult findAllMap() throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findHealthMatrixMap() throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
-    /***********************************************************************************************************************/
-    @Override
-    public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult findHealthMatrixMap() throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
 
-    @Override
-    public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception   {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception   {
-        return  AjaxResult.error(throwable.getMessage());
-    }
 
-    @Override
-    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception   {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
 
-    @Override
-    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
 
-    @Override
-    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception   {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId,@RequestParam("type") String type) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
- /***********************************************************************************************************************/
-     @Override
-     public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception {
-         return  AjaxResult.error(throwable.getMessage());
-     }
 
+            @Override
+            public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId, @RequestParam("type") String type) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-     @Override
-    public AjaxResult countStop(@RequestParam("type") String type) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
 
+            @Override
+            public AjaxResult countStop(@RequestParam("type") String type) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult findWpOrProStatusForHistory(@RequestParam("type") String type,@RequestParam("status")  String status) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult findWpOrProStatusForHistory(@RequestParam("type") String type, @RequestParam("status") String status) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 /***********************************************************************************************************************/
-    /**性能损失走势列表**/
-    @Override
-    public AjaxResult losspowerrateList(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /**性能损失走势列表**/
+            @Override
+            public AjaxResult losspowerrateList(@RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    /**性能损失走势图表**/
-    @Override
-    public AjaxResult getChartlist(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /**性能损失走势图表**/
+            @Override
+            public AjaxResult getChartlist(@RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
- /***********************************************************************************************************************/
-    /**批次报警分析**/
-    @Override
-    public AjaxResult partbjList(@RequestParam("recorddate") String recorddate) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            /**批次报警分析**/
+            @Override
+            public AjaxResult partbjList(@RequestParam("recorddate") String recorddate) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
 
-    /**批次报警分析**/
-    @Override
-    public AjaxResult partbjsubList(@RequestParam("lnid") String lnid,@RequestParam("part")  String part,@RequestParam("recorddate")  String recorddate) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /**批次报警分析**/
+            @Override
+            public AjaxResult partbjsubList(@RequestParam("lnid") String lnid, @RequestParam("part") String part, @RequestParam("recorddate") String recorddate) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
- /***********************************************************************************************************************/
-    @Override
-    public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId,@RequestParam("modelId") String modelId,@RequestParam("typeId")  String typeId) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId, @RequestParam("modelId") String modelId, @RequestParam("typeId") String typeId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
 
-    @Override
-    public AjaxResult stopAnalysisTree(@RequestParam("mainId")  String mainId,@RequestParam("wtId") String wtId, @RequestParam("values") String values) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult stopAnalysisTree(@RequestParam("mainId") String mainId, @RequestParam("wtId") String wtId, @RequestParam("values") String values) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
 
-    @Override
-    public AjaxResult saveStopAnalysis(@RequestParam("wpId")  String wpId,@RequestParam("modelId")  String modelId,@RequestParam("typeId")  String typeId) throws Exception{
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult saveStopAnalysis(@RequestParam("wpId") String wpId, @RequestParam("modelId") String modelId, @RequestParam("typeId") String typeId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    /***********************************************************************************************************************/
-    /**单机区间曲线偏差率**/
-    @Override
-    public AjaxResult windTurbineCurveList(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            /**单机区间曲线偏差率**/
+            @Override
+            public AjaxResult windTurbineCurveList(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    /**
-     * @throws
-     * @Title: scatterWtByDayAjax
-     * @Description: 获得选择风机、年份、月份相关散点图
-     */
-    @Override
-    public AjaxResult scatterWtByDayAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) throws Exception {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /**
+             * @throws
+             * @Title: scatterWtByDayAjax
+             * @Description: 获得选择风机、年份、月份相关散点图
+             */
+            @Override
+            public AjaxResult scatterWtByDayAjax(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    /***********************************************************************************************************************/
-    /**风机健康列表**/
-    @Override
-    public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception  {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /***********************************************************************************************************************/
+            /**风机健康列表**/
+            @Override
+            public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-    @Override
-    public AjaxResult warehouse(){
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            @Override
+            public AjaxResult warehouse() {
+                return AjaxResult.error(throwable.getMessage());
+            }
 
-      /***********************************************************************************************************************/
+            /***********************************************************************************************************************/
 
-    /**故障分析雷达图**/
-    @Override
-    public AjaxResult gzfx(@RequestParam(value = "stationid", required = true) String stationid,
-                           @RequestParam(value = "date", required = true) String date){
-        return  AjaxResult.error(throwable.getMessage());
-    }
-    /***********************************************************************************************************************/
-    /**预警分析雷达图**/
-    @Override
-    public AjaxResult yjfx(@RequestParam(value = "stationid", required = true) String stationid,
-                           @RequestParam(value = "date", required = true) String date) {
-        return  AjaxResult.error(throwable.getMessage());
-    }
+            /**故障分析雷达图**/
+            @Override
+            public AjaxResult gzfx(@RequestParam(value = "stationid", required = true) String stationid,
+                                   @RequestParam(value = "date", required = true) String date) {
+                return AjaxResult.error(throwable.getMessage());
+            }
             /***********************************************************************************************************************/
+            /**预警分析雷达图**/
+            @Override
+            public AjaxResult yjfx(@RequestParam(value = "stationid", required = true) String stationid,
+                                   @RequestParam(value = "date", required = true) String date) {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult detail(@RequestParam(name = "station") String station,
+                                     @RequestParam(name = "wtId") String wtId,
+                                     @RequestParam(name = "name") String name,
+                                     @RequestParam(name = "startTs") long startTs,
+                                     @RequestParam(name = "endTs") long endTs,
+                                     @RequestParam(name = "interval", required = false) Integer interval) {
+                return AjaxResult.error(throwable.getMessage());
+            }
+            /************************************************************************************************/
+            @Override
+            public AjaxResult healthsystemList(Tablepar tablepar) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemDelete(@RequestParam("ids")String ids) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemSelect(@RequestParam("id")String id) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemUpdate( Healthsystem record) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemInsert( Healthsystem record) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemsubList( Tablepar tablepar) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult healthsystemsubDelete(@RequestParam("ids") String ids) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemsubSelect(@RequestParam("id") String id) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult healthsystemsubUpdate(Healthsystemsub record) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
             @Override
-            public AjaxResult detail(   @RequestParam(name = "station") String station,
-                                        @RequestParam(name = "wtId") String wtId,
-                                        @RequestParam(name = "name") String name,
-                                        @RequestParam(name = "startTs") long startTs,
-                                        @RequestParam(name = "endTs") long endTs,
-                                        @RequestParam(name = "interval", required = false)  Integer interval) {
-                return  AjaxResult.error(throwable.getMessage());
+            public AjaxResult healthsystemsubInsert( Healthsystemsub record) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
             }
         };
     }

web/consumer-hb/src/main/java/com/gyee/consumer/model/Healthsystem.java

@@ -0,0 +1,244 @@
+package com.gyee.consumer.model;
+
+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/consumer-hb/src/main/java/com/gyee/consumer/model/Healthsystemsub.java

@@ -0,0 +1,444 @@
+package com.gyee.consumer.model;
+
+
+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/consumer-hb/src/main/java/com/gyee/consumer/service/health/HealthService.java

@@ -4,6 +4,8 @@ package com.gyee.consumer.service.health;
 import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.config.FeignConfiguration;
 import com.gyee.consumer.fallback.health.HealthServiceFallbackFactory;
+import com.gyee.consumer.model.Healthsystem;
+import com.gyee.consumer.model.Healthsystemsub;
 import com.gyee.consumer.model.Tablepar;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -153,4 +155,46 @@ public interface HealthService {
                                 @RequestParam(name = "startTs") long startTs,
                                 @RequestParam(name = "endTs") long endTs,
                                 @RequestParam(name = "interval", required = false) Integer interval);
+    /***********************************************************************************************************************/
+
+    @PostMapping("/healthsub/healthsystemList")
+    public AjaxResult healthsystemList(Tablepar tablepar) throws Exception;
+
+    @PostMapping("/healthsub/healthsystemDelete")
+    public AjaxResult healthsystemDelete(@RequestParam("ids") String ids) throws Exception;
+
+
+    @GetMapping("/healthsub/healthsystemSelect")
+       public AjaxResult healthsystemSelect(@RequestParam("id") String id) throws Exception;
+
+
+    @PostMapping("/healthsub/healthsystemUpdate")
+
+    public AjaxResult healthsystemUpdate(Healthsystem record) throws Exception;
+
+
+    @PostMapping("/healthsub/healthsystemInsert")
+        public AjaxResult healthsystemInsert(Healthsystem record) throws Exception;
+
+
+
+    @PostMapping("/healthsub/healthsystemsubList")
+    public AjaxResult healthsystemsubList(Tablepar tablepar) throws Exception;
+
+
+    @PostMapping("/healthsub/healthsystemsubDelete")
+
+    public AjaxResult healthsystemsubDelete(@RequestParam("ids") String ids) throws Exception ;
+
+    @GetMapping("/healthsub/healthsystemsubSelect")
+
+    public AjaxResult healthsystemsubSelect(@RequestParam("id") String id) throws Exception;
+
+    @PostMapping("/healthsub/healthsystemsubUpdate")
+
+    public AjaxResult healthsystemsubUpdate(Healthsystemsub record) throws Exception;
+
+    @PostMapping("/healthsub/healthsystemsubInsert")
+
+    public AjaxResult healthsystemsubInsert(Healthsystemsub record) throws Exception;
 }