大屏配置，峰平谷大屏查询

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/gatherData/mapper/xml/FpgGatherDataMapper.xml

@@ -12,7 +12,7 @@
     </select>
     <select id="getFpgMiddleTwoData" parameterType="java.lang.String" resultType="org.jeecg.modules.gatherData.entity.FpgMiddleTwoData">
         SELECT SUM(active_power) as active_power, SUM(run_current) as currents,formatted_date FROM (SELECT
-                current, active_power, DATE_FORMAT(create_time, '%H:00') AS formatted_date
+            run_current, active_power, DATE_FORMAT(create_time, '%H:00') AS formatted_date
             FROM
                 fpg_gather_data
             WHERE

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/controller/HomePageDataController.java

@@ -6,10 +6,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.homePageData.service.IHomePageDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -39,8 +41,11 @@ public class HomePageDataController {
     @AutoLog(value = "评价")
     @ApiOperation(value="评价", notes="评价")
     @GetMapping(value = "/regionPfvElectricity")
-    public Result<List<Map<String, String>>> regionPfvElectricity() {
-        List<Map<String, String>> list = homePageDataService.regionPfvElectricity();
+    public Result<List<Map<String, String>>> regionPfvElectricity(@RequestParam(name="modelId",required=false) String modelId) {
+        if (oConvertUtils.isEmpty(modelId)){
+            return Result.error("查询失败，请设置模型！");
+        }
+        List<Map<String, String>> list = homePageDataService.regionPfvElectricity(modelId);
         return Result.OK(list);
     }
 
@@ -67,8 +72,11 @@ public class HomePageDataController {
     @AutoLog(value = " 违规计量")
     @ApiOperation(value="违规计量", notes="违规计量")
     @GetMapping(value = "/illegalMetering")
-    public Result<List<Map<String, String>>> illegalMetering() {
-        List<Map<String, String>> res = homePageDataService.illegalMetering();
+    public Result<List<Map<String, String>>> illegalMetering(@RequestParam(name="modelId",required=false) String modelId) {
+        if (oConvertUtils.isEmpty(modelId)){
+            return Result.error("查询失败，请设置模型！");
+        }
+        List<Map<String, String>> res = homePageDataService.illegalMetering(modelId);
         return Result.OK(res);
     }
 
@@ -80,8 +88,11 @@ public class HomePageDataController {
     @AutoLog(value = "轧钢管控")
     @ApiOperation(value="轧钢管控", notes="轧钢管控")
     @GetMapping(value = "/rollingControl")
-    public Result<List<Map<String, String>>> rollingControl() {
-        List<Map<String, String>> res = homePageDataService.rollingControl();
+    public Result<List<Map<String, String>>> rollingControl(@RequestParam(name="modelId",required=false) String modelId) {
+        if (oConvertUtils.isEmpty(modelId)){
+            return Result.error("查询失败，请设置模型！");
+        }
+        List<Map<String, String>> res = homePageDataService.rollingControl(modelId);
         return Result.OK(res);
     }
 
@@ -94,8 +105,11 @@ public class HomePageDataController {
     @AutoLog(value = "峰平谷时间段用电量")
     @ApiOperation(value="峰平谷时间段用电量", notes="峰平谷时间段用电量")
     @GetMapping(value = "/fpvTimeElectricity")
-    public Result<Map<String, List>> fpvTimeElectricity() {
-        Map<String, List> res = homePageDataService.fpvTimeElectricity();
+    public Result<Map<String, List>> fpvTimeElectricity(@RequestParam(name="modelId",required=false) String modelId) {
+        if (oConvertUtils.isEmpty(modelId)){
+            return Result.error("查询失败，请设置模型！");
+        }
+        Map<String, List> res = homePageDataService.fpvTimeElectricity(modelId);
         return Result.OK(res);
     }
 

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/service/IHomePageDataService.java

@@ -10,7 +10,7 @@ public interface IHomePageDataService {
      *
      * @return
      */
-    List<Map<String, String>> regionPfvElectricity();
+    List<Map<String, String>> regionPfvElectricity(String modelId);
 
     /**
      * 设备在线情况
@@ -24,21 +24,21 @@ public interface IHomePageDataService {
      *
      * @return
      */
-    List<Map<String, String>> illegalMetering();
+    List<Map<String, String>> illegalMetering(String modelId);
 
     /**
      * 区域用电占比
      *
      * @return
      */
-    List<Map<String, String>> rollingControl();
+    List<Map<String, String>> rollingControl(String modelId);
 
     /**
      * 峰平谷时间段用电量
      *
      * @return
      */
-    Map<String, List> fpvTimeElectricity();
+    Map<String, List> fpvTimeElectricity(String modelId);
 
     /**
      * 实时报警

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/service/impl/HomePageDataServiceImpl.java

@@ -5,6 +5,8 @@ import org.jeecg.modules.deviceLesm.entity.DeviceRegion;
 import org.jeecg.modules.deviceLesm.entity.DeviceRegionInformation;
 import org.jeecg.modules.deviceLesm.mapper.DevicePointMapper;
 import org.jeecg.modules.deviceLesm.service.IDeviceRegionService;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+import org.jeecg.modules.fpgLeanModel.service.IFpgLeanModelService;
 import org.jeecg.modules.gatherData.entity.FpgMiddleTwoData;
 import org.jeecg.modules.gatherData.mapper.FpgGatherDataMapper;
 import org.jeecg.modules.homePageData.entity.LeanEventWarnInfoResult;
@@ -39,9 +41,13 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
     @Autowired
     private LeanEventWarnInfoMapper leanEventWarnInfoMapper;
 
+    @Autowired
+    private IFpgLeanModelService fpgLeanModelService;
+
 
     @Override
-    public List<Map<String, String>> regionPfvElectricity() {
+    public List<Map<String, String>> regionPfvElectricity(String modelId) {
+        String leanModelCode = queryLeanModelCodeById(modelId);
         Date today = new Date();
         String dayDate = new SimpleDateFormat("yyyy-MM-dd").format(today);
         List<DeviceRegion> list = deviceRegionService.list();
@@ -137,9 +143,11 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
     }
 
     @Override
-    public List<Map<String, String>> illegalMetering() {
-        List<DeviceRegion> list = deviceRegionService.list();
+    public List<Map<String, String>> illegalMetering(String modelId) {
         List<Map<String, String>> res = new ArrayList<>();
+        String leanModelCode = queryLeanModelCodeById(modelId);
+
+        List<DeviceRegion> list = deviceRegionService.list();
         list.forEach(deviceRegion -> {
             Map<String,String> map = new HashMap<>();
             map.put("name",deviceRegion.getRegionTitle());
@@ -151,8 +159,10 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
     }
 
     @Override
-    public List<Map<String, String>> rollingControl() {
+    public List<Map<String, String>> rollingControl(String modelId) {
         List<Map<String, String>> res = new ArrayList<>();
+        String leanModelCode = queryLeanModelCodeById(modelId);
+
         String[] names = {"棒一","棒二","棒三","高线","板带"};
         Arrays.asList(names).forEach(name -> {
             Map<String, String> map = new HashMap<>();
@@ -169,7 +179,10 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
     }
 
     @Override
-    public Map<String, List> fpvTimeElectricity() {
+    public Map<String, List> fpvTimeElectricity(String modelId) {
+        Map<String, List> res = new HashMap<>();
+        String leanModelCode = queryLeanModelCodeById(modelId);
+
         Date today = new Date();
         String dayDate = new SimpleDateFormat("yyyy-MM-dd 00:00:00").format(today);
         List<Map<String,String>> tops = new ArrayList<>();
@@ -192,7 +205,7 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MILLISECOND, 0);
-        Map<String, List> res = new HashMap<>();
+
         for (int i = 0; i < 24; i++) {
             calendar.set(Calendar.HOUR_OF_DAY, i);
             Double electricity = Math.random()*100+200;
@@ -279,4 +292,17 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
         res.put("value",value);
         return res;
     }
+
+    /**
+     * 根据模型ID查询模型编码
+     * @param modelId
+     * @return
+     */
+    private String queryLeanModelCodeById(String modelId) {
+        FpgLeanModel fpgLeanModel = fpgLeanModelService.getById(modelId);
+        if (oConvertUtils.isEmpty(fpgLeanModel)){
+            return null;
+        }
+        return fpgLeanModel.getLeanModelCode();
+    }
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenConfigController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.largeScreen.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -68,6 +69,11 @@ public class LargeScreenConfigController extends JeecgController<LargeScreenConf
 	@RequiresPermissions("largeScreen:large_screen_config:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody LargeScreenConfig largeScreenConfig) {
+		LambdaQueryWrapper<LargeScreenConfig> queryWrapper = new LambdaQueryWrapper<LargeScreenConfig>().eq(LargeScreenConfig::getLargeScreenCode, largeScreenConfig.getLargeScreenCode());
+		LargeScreenConfig largeScreenConfigCode = largeScreenConfigService.getOne(queryWrapper);
+		if (largeScreenConfigCode != null){
+			return Result.error("大屏编码重复，添加失败！");
+		}
 		largeScreenConfigService.save(largeScreenConfig);
 		return Result.OK("添加成功！");
 	}
@@ -83,7 +89,10 @@ public class LargeScreenConfigController extends JeecgController<LargeScreenConf
 	@RequiresPermissions("largeScreen:large_screen_config:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody LargeScreenConfig largeScreenConfig) {
-		largeScreenConfigService.updateOrSaveById(largeScreenConfig);
+		LargeScreenConfig re = largeScreenConfigService.updateOrSaveById(largeScreenConfig);
+		if (re == null){
+			return Result.error("大屏编码重复，编辑失败！");
+		}
 		return Result.OK("编辑成功!");
 	}
 	

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/largeScreen/service/ILargeScreenConfigService.java

@@ -11,7 +11,7 @@ import org.jeecg.modules.largeScreen.entity.LargeScreenConfig;
  */
 public interface ILargeScreenConfigService extends IService<LargeScreenConfig> {
 
-    void updateOrSaveById(LargeScreenConfig largeScreenConfig);
+    LargeScreenConfig updateOrSaveById(LargeScreenConfig largeScreenConfig);
 
     LargeScreenConfig getLargeScreenConfigById(String id, String largeScreenCode);
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/largeScreen/service/impl/LargeScreenConfigServiceImpl.java

@@ -18,14 +18,21 @@ import org.springframework.stereotype.Service;
 public class LargeScreenConfigServiceImpl extends ServiceImpl<LargeScreenConfigMapper, LargeScreenConfig> implements ILargeScreenConfigService {
 
     @Override
-    public void updateOrSaveById(LargeScreenConfig largeScreenConfig) {
+    public LargeScreenConfig updateOrSaveById(LargeScreenConfig largeScreenConfig) {
 
         LambdaQueryWrapper<LargeScreenConfig> queryWrapper = new LambdaQueryWrapper<LargeScreenConfig>().eq(LargeScreenConfig::getId, largeScreenConfig.getId());
         LargeScreenConfig largeScreenConfigQuery = baseMapper.selectOne(queryWrapper);
         if (largeScreenConfigQuery == null){
             baseMapper.insert(largeScreenConfig);
+            return largeScreenConfigQuery;
         }else {
+            LambdaQueryWrapper<LargeScreenConfig> queryWrapper1 = new LambdaQueryWrapper<LargeScreenConfig>().eq(LargeScreenConfig::getLargeScreenCode, largeScreenConfig.getLargeScreenCode());
+            LargeScreenConfig largeScreenConfigCode = baseMapper.selectOne(queryWrapper1);
+            if (largeScreenConfigCode != null && !largeScreenConfigQuery.getId().equals(largeScreenConfigCode.getId())){
+                return null;
+            }
             baseMapper.updateById(largeScreenConfig);
+            return largeScreenConfigQuery;
         }
     }