保修接口返回颜色码更改---物业服务postStation

新增菜品种类数量接口---绿智食堂Controller

project-zcustom/src/main/java/com/project/zcustom/controller/smart/PlatGreenSmartController.java

@@ -153,4 +153,10 @@ public class PlatGreenSmartController extends BaseController {
         return AjaxResult.success("查询成功", iPlatGreenFoodsService.getPlatGreenFoodsByField("app_org",appOrg));
     }
 
+    @ApiOperation("菜品种类数量")
+    @RequestMapping("/getFoodsTypeNum")
+    public AjaxResult getFoodsTypeNum(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", iPlatGreenFoodsService.getFoodsTypeNum(appOrg));
+    }
+
 }

project-zcustom/src/main/java/com/project/zcustom/mapper/smart/PlatGreenFoodsMapper.java

@@ -18,4 +18,6 @@ public interface PlatGreenFoodsMapper extends MPJBaseMapper<PlatGreenFoods> {
      * 真删接口
      */
     Integer reallyDeleteByWrapper(@Param(Constants.WRAPPER) LambdaQueryWrapper<PlatGreenFoods> deleteWrapper);
+
+    public String getFoodsTypeNum(String appOrg);
 }

project-zcustom/src/main/java/com/project/zcustom/service/post/impl/PlatPostStationChartServiceImpl.java

@@ -193,7 +193,7 @@ public class PlatPostStationChartServiceImpl extends ServiceImpl<PlatPostStation
         }).collect(Collectors.toList());
         List<String> nameList = Arrays.asList("办公家具报修", "冷热水故障", "门禁故障", "其他报修故障", "墙类/地类报修", "电气故障报修", "电梯故障", "消防设施设备故障", "保洁服务", "空调故障");
         List<String> keyList = Arrays.asList("colNum", "elevatorNum", "laNum", "seNum", "toNum", "arNum", "diNum", "otNum", "meNum", "ofNum");
-        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#ffffff");
+        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#FF99C3");
         List<Long> defaultList = StringUtils.getDefaultListLong(6);
         List<List<Long>> yList = Arrays.asList(defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList,defaultList);
         Map<String,Object> yMap = new HashMap<>();

project-zcustom/src/main/java/com/project/zcustom/service/post/impl/PlatPostStationServiceImpl.java

@@ -332,7 +332,7 @@ public class PlatPostStationServiceImpl extends ServiceImpl<PlatPostStationMappe
             valueList = Arrays.asList(platPostStation.getFurniture(), platPostStation.getHotColdWater(), platPostStation.getAccessControl(), platPostStation.getOther(), platPostStation.getWall(), platPostStation.getElectrical(), platPostStation.getElevator(), platPostStation.getFireControl(), platPostStation.getCleaning(), platPostStation.getAirConditioning());
         }
         List<String> xList = Arrays.asList("办公家具报修", "冷热水故障", "门禁故障", "其他报修故障", "墙类/地类报修", "电气故障报修", "电梯故障", "消防设施设备故障", "保洁服务", "空调故障");
-        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#ffffff");
+        List<String> colorList = Arrays.asList("#ff9d00", "#2f82fe", "#12db62", "#7565ef", "#079966", "#4e2ffe", "#00f6ec", "#ff7300", "#002aff", "#FF99C3");
         List<Map<String, Object>> tempList = new ArrayList<>();
         StringUtils.createdPieData(xList,colorList,valueList,tempList);
         return tempList;

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenFoodsService.java

@@ -95,4 +95,10 @@ public interface IPlatGreenFoodsService extends IService<PlatGreenFoods> {
      * @param mapField
      */
     public void addPlatGreenFoods(String appOrg, Map<String, Object> mapField);
+
+    /**
+     * 单位菜品种类数量
+     * @param appOrg
+     */
+    public int getFoodsTypeNum(String appOrg);
 }

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenFoodsServiceImpl.java

@@ -10,10 +10,13 @@ import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.smart.PlatGreenFoods;
 import com.project.zcustom.mapper.smart.PlatGreenFoodsMapper;
 import com.project.zcustom.service.smart.IPlatGreenFoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 菜谱数据Service业务层处理
@@ -23,6 +26,8 @@ import java.util.Map;
  */
 @Service
 public class PlatGreenFoodsServiceImpl extends ServiceImpl<PlatGreenFoodsMapper, PlatGreenFoods> implements IPlatGreenFoodsService {
+    @Autowired
+    private PlatGreenFoodsMapper platGreenFoodsMapper;
 
     /**
      * 组装查询条件
@@ -180,4 +185,16 @@ public class PlatGreenFoodsServiceImpl extends ServiceImpl<PlatGreenFoodsMapper,
             this.save(foods);
         }
     }
+
+    public int getFoodsTypeNum(String appOrg){
+        String str = platGreenFoodsMapper.getFoodsTypeNum(appOrg);
+        Pattern pattern = Pattern.compile("\\bname\\b", Pattern.CASE_INSENSITIVE);  // 单词边界，忽略大小写
+        Matcher matcher = pattern.matcher(str);
+        int count = 0;
+        // 遍历匹配到的结果
+        while (matcher.find()) {
+            count++;
+        }
+        return count;
+    }
 }

project-zcustom/src/main/resources/mapper/zcustom/smart/PlatGreenSmartFoodsMapper.xml

@@ -19,4 +19,8 @@
     <delete id="reallyDeleteByWrapper">
         DELETE FROM large_plat_green_foods ${ew.customSqlSegment}
     </delete>
+
+    <select id="getFoodsTypeNum" parameterType="String" resultType="String">
+        select food_info from large_plat_green_foods where app_org = #{appOrg}
+    </select>
 </mapper>