Explorar el Código

接口改动---

zhanghao hace 5 meses
padre
commit
48901c0867

+ 11 - 0
project-common/src/main/java/com/project/common/utils/StringUtils.java

@@ -586,6 +586,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
     /**
+     * 获取组装图表数据
+     */
+    public static void createdTableData(List<String> xList,Object yList,List<String>  cList,Map<String, Object> mapInfo) {
+        mapInfo.put("xList",xList);
+        Map<String, Object> temp = new HashMap<>();
+        temp.put("cList",cList);
+        temp.put("yList", yList);
+        mapInfo.put("yData",temp);
+    }
+
+    /**
      * 生成默认list<long>数组
      */
     public static List<Long> getDefaultListLong(int size) {

+ 3 - 3
project-zcustom/src/main/java/com/project/zcustom/controller/property/PlatPropertyController.java

@@ -47,9 +47,9 @@ public class PlatPropertyController extends BaseController {
         return AjaxResult.success("查询成功", platPropertyListService.selectServerListByAppOrg(appOrg));
     }
 
-    @ApiOperation("工具箱二具数量")
-    @RequestMapping("/getToolsChartsList")
-    public AjaxResult getToolsChartsList(@RequestParam String appOrg) {
+    @ApiOperation("健康自测&远程问诊")
+    @RequestMapping("/getSelfTestAndConsultation")
+    public AjaxResult getSelfTestAndConsultation(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platPropertyToolsService.getToolsChartsList(appOrg));
     }
 }

+ 1 - 1
project-zcustom/src/main/java/com/project/zcustom/controller/unit/emailController.java → project-zcustom/src/main/java/com/project/zcustom/controller/unit/LargeEmailController.java

@@ -17,7 +17,7 @@ import java.io.File;
 
 @RestController
 @RequestMapping("/zcustom/email")
-public class emailController {
+public class LargeEmailController {
     /**
      * 邮件发送接口
      */

+ 4 - 1
project-zcustom/src/main/java/com/project/zcustom/service/employee/impl/PlatEmployeeHealthIllnessServiceImpl.java

@@ -211,15 +211,18 @@ public class PlatEmployeeHealthIllnessServiceImpl extends ServiceImpl<PlatEmploy
         List<PlatEmployeeHealthIllness> list = this.list(lqw);
         Map<String, Object> tempMap = new HashMap<>();
         List<String> nameList;
+        List<String> colorList;
         List<Long> valueList;
         if (list.isEmpty()){
             nameList = Arrays.asList("高血压","高血脂","高血糖");
             valueList = StringUtils.getDefaultListLong(3);
+            colorList = null;
         }else{
             nameList = list.stream().map(PlatEmployeeHealthIllness::getParamsName).collect(Collectors.toList());
             valueList = list.stream().map(PlatEmployeeHealthIllness::getParamsValue).collect(Collectors.toList());
+            colorList = Arrays.asList("#6DC8EC","#5AD8A6","#eaa654");
         }
-        StringUtils.createdTableData(nameList,valueList,"#eaa654",tempMap);
+        StringUtils.createdTableData(nameList,valueList,colorList,tempMap);
         return tempMap;
     }
 }