kangwei: 区域用户数据权限问题

@@ -91,7 +91,7 @@ public class SysCommandCentreController {
         fReportItemvList.add( avgDayDataVO );
 
         //年数据统计：
-        String total = factoryInfoService.querySumProScale();
+        String total = factoryInfoService.querySumProScale( departIds );
         total = String.format("%.2f", Double.parseDouble(total));
         fReportItemvList.add( new FRportlCommandCenterVO(  total,"0","0"));
 
@@ -364,8 +364,13 @@ public class SysCommandCentreController {
     @ApiOperation(value="指挥中心-药剂趋势", notes="指挥中心-药剂趋势")
     @GetMapping(value = "/statisticsByYjqs")
     public Result<DepartDrugResult> statisticsByYjqs(@RequestParam(name = "month", required = true)String month) {
-        DateVO dateVO = new DateVO(month);
-        DepartDrugResult departDrugResult = commandCentreService.getYhTotal(dateVO.getNowMonth());
+       // DateVO dateVO = new DateVO(month);
+
+        String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
+       /* if(StringUtils.isNotEmpty(reportItemvParam.getDepartIds()) ){
+            departIds = reportItemvParam.getDepartIds();
+        }*/
+        DepartDrugResult departDrugResult = commandCentreService.getYhTotal(departIds,month);
         Result<DepartDrugResult> result = new Result<>();
         result.setSuccess(true);
         result.setResult(departDrugResult);

@@ -26,7 +26,7 @@ public interface ICommandCentreService {
      * @param month
      * @return
      */
-    DepartDrugResult getYhTotal(String month);
+    DepartDrugResult getYhTotal(String departIds,String month);
     /***
      * 指挥中心----运行负荷率分析----处理水量详情
      * @param

@@ -43,21 +43,21 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
     }
 
     @Override
-    public DepartDrugResult getYhTotal(String month) {
+    public DepartDrugResult getYhTotal(String departIds,String month) {
         String monthTb = DateUtils.getTbMonth(month);//同比时间
         String monthHb = DateUtils.getHbMonth(month);//环比时间
-        String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, "", month);
-        String dataViewName2119tb = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, "", monthTb);
-        String dataViewName2119hb = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, "", monthHb);
-        String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldYj, "", month);
-        String dataViewName3a24tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldYj, "", monthTb);
-        String dataViewName3a24hb = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldYj, "", monthHb);
+        String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, month);
+        String dataViewName2119tb = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, monthTb);
+        String dataViewName2119hb = ReportViewUtil.buildViewLike(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, monthHb);
+        String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, month);
+        String dataViewName3a24tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, monthTb);
+        String dataViewName3a24hb = ReportViewUtil.buildViewLike(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, monthHb);
         DepartDrugResult departDrugResult = fReportItemvMapper.getYhData(month,monthTb,monthHb,
                 dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb);
         if(departDrugResult == null){
             departDrugResult = new DepartDrugResult();
         }
-        List<DepartDrugDataVO> drugList = new ArrayList<>();
+        List<DepartDrugDataVO> drugList = null;
         drugList =  fReportItemvMapper.getYhList(month,monthTb,monthHb,
                 dataViewName2119,dataViewName2119tb,dataViewName2119hb,
                 dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb);

@@ -2,6 +2,7 @@ package com.skua.modules.emergency.controller;
 
 import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.context.BaseContextHandler;
 import com.skua.modules.emergency.service.IEmergencyRiskEventService;
 import com.skua.modules.emergency.vo.DangerDatabaseResult;
 import com.skua.modules.emergency.vo.MapDatabaseResult;
@@ -9,6 +10,7 @@ import com.skua.modules.emergency.vo.RiskDatabaseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.*;
@@ -58,9 +60,12 @@ public class EventMapController {
 	@AutoLog(value = "隐患排查巡检统计")
 	@ApiOperation(value="隐患排查巡检统计", notes="隐患排查巡检统计")
 	@GetMapping(value = "/getDangerList")
-	public Result<List<DangerDatabaseResult>> getDangerList(String year){
+	public Result<List<DangerDatabaseResult>> getDangerList( String departIds,String year){
 		Result<List<DangerDatabaseResult>> result = new Result<>();
-		List<DangerDatabaseResult> list = emergencyRiskEventService.getDangerList(year);
+		if(StringUtils.isEmpty(departIds)){
+			departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
+		}
+		List<DangerDatabaseResult> list = emergencyRiskEventService.getDangerList(departIds,year);
 		result.setSuccess(true);
 		result.setResult(list);
 		return result;
@@ -72,9 +77,12 @@ public class EventMapController {
 	@AutoLog(value = "地图隐患排查巡检统计")
 	@ApiOperation(value="地图隐患排查巡检统计", notes="地图隐患排查巡检统计")
 	@GetMapping(value = "/getMapData")
-	public Result<List<MapDatabaseResult>> getMapData(String year){
+	public Result<List<MapDatabaseResult>> getMapData(String departIds,String year){
 		Result<List<MapDatabaseResult>> result = new Result<>();
-		List<MapDatabaseResult> list = emergencyRiskEventService.getMapData(year);
+		if(StringUtils.isEmpty(departIds)){
+			departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
+		}
+		List<MapDatabaseResult> list = emergencyRiskEventService.getMapData(departIds,year);
 		result.setSuccess(true);
 		result.setResult(list);
 		return result;

@@ -19,8 +19,8 @@ public interface EmergencyRiskEventMapper extends BaseMapper<EmergencyRiskEvent>
     List<RiskDatabaseResult> getRiskList(@Param("year") String year);
 
     @Anonymous
-    List<DangerDatabaseResult> getDangerList(@Param("year") String year);
+    List<DangerDatabaseResult> getDangerList( @Param("departIds")String departIds , @Param("year") String year);
 
     @Anonymous
-    List<MapDatabaseResult> getMapData(@Param("year") String year);
+    List<MapDatabaseResult> getMapData( @Param("departIds")String departIds , @Param("year") String year);
 }

@@ -38,7 +38,9 @@
         WHERE
             d.depart_type = 1
             AND r.report_date LIKE CONCAT(#{year},'%')
-
+            <if test="departIds != null and departIds !='' ">
+                and d.id in (${departIds})
+            </if>
             order by  r.report_date desc
     </select>
 
@@ -53,6 +55,10 @@
             LEFT JOIN sys_factory_info f ON f.depart_id = d.id
         WHERE
             d.depart_type = 1
+            <if test="departIds != null and departIds !='' ">
+                and d.id in (${departIds})
+            </if>
+
     </select>
 
 </mapper>

@@ -45,12 +45,12 @@ public interface IEmergencyRiskEventService extends IService<EmergencyRiskEvent>
      * 隐患排查巡检统计
      * @return
      */
-    List<DangerDatabaseResult> getDangerList(String year);
+    List<DangerDatabaseResult> getDangerList(String departIds, String year);
 
     /**
      * 地图隐患排查数量
      * @param year
      * @return
      */
-    List<MapDatabaseResult> getMapData(String year);
+    List<MapDatabaseResult> getMapData(String departIds,  String year);
 }

@@ -29,6 +29,7 @@ import com.skua.modules.safe.entity.DangerLevelManageShare;
 import com.skua.modules.safe.mapper.DangerInspectionRecordMapper;
 import com.skua.modules.safe.mapper.DangerLevelManageMapper;
 import com.skua.modules.safe.mapper.DangerLevelManageShareMapper;
+import com.skua.tool.util.JSUtils;
 import com.skua.tool.util.UniqIdUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -160,21 +161,21 @@ public class EmergencyRiskEventServiceImpl extends ServiceImpl<EmergencyRiskEven
     }
 
     @Override
-    public List<DangerDatabaseResult> getDangerList(String year) {
+    public List<DangerDatabaseResult> getDangerList(String departIds, String year) {
         if(StringUtils.isEmpty(year)){
             year = String.valueOf(DateUtils.getYear());
         }
-        List<DangerDatabaseResult> list = emergencyRiskEventMapper.getDangerList(year);
+        List<DangerDatabaseResult> list = emergencyRiskEventMapper.getDangerList(JSUtils.quoteEach( departIds, ","),  year);
         return list;
     }
 
     @Override
-    public List<MapDatabaseResult> getMapData(String year) {
+    public List<MapDatabaseResult> getMapData(String departIds,String year) {
         if(StringUtils.isEmpty(year)){
             year = String.valueOf(DateUtils.getYear());
         }
-        List<DangerDatabaseResult> dangerList = emergencyRiskEventMapper.getDangerList(year);
-        List<MapDatabaseResult> list = emergencyRiskEventMapper.getMapData(year);
+        List<DangerDatabaseResult> dangerList = emergencyRiskEventMapper.getDangerList(JSUtils.quoteEach(departIds,","),  year);
+        List<MapDatabaseResult> list = emergencyRiskEventMapper.getMapData(JSUtils.quoteEach(departIds,","),year);
         for (MapDatabaseResult mapDatabaseResult : list) {
             List<DangerDatabaseResult> daList = new ArrayList<>();
             String departId = mapDatabaseResult.getDepartId();

@@ -3,6 +3,7 @@ package com.skua.modules.report.controller;
 
 import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.context.BaseContextHandler;
 import com.skua.modules.custom.service.IFCustomReportDatasetService;
 import com.skua.modules.report.service.IOperationReportService;
 import com.skua.modules.report.vo.JnhbReportData;
@@ -38,7 +39,8 @@ public class OperationReportController {
             @RequestParam(name="season") Integer season,
             HttpServletRequest req) {
         Result<ProductDataVO>  result = new Result<ProductDataVO>();
-        ProductDataVO productDataVO =  operationReportService.handeReportMonthData(year,season);
+        String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
+        ProductDataVO productDataVO =  operationReportService.handeReportMonthData(departIds,year,season);
         result.setResult( productDataVO  );
         return result;
     }

@@ -13,5 +13,5 @@ public interface IOperationReportService {
      * @param season
      * @return
      */
-    ProductDataVO handeReportMonthData(Integer year, Integer season);
+    ProductDataVO handeReportMonthData(String departIds,Integer year, Integer season);
 }

@@ -44,7 +44,7 @@ public class OperationReportServiceImpl implements  IOperationReportService {
      * @param season
      * @return
      */
-    public ProductDataVO handeReportMonthData(Integer year, Integer season){
+    public ProductDataVO handeReportMonthData(String departId,Integer year, Integer season){
         ProductDataVO  productDataVO = new ProductDataVO();//返回结果
         int lastYear  = year - 1;//去年
         productDataVO.setLastYear(lastYear);
@@ -54,12 +54,12 @@ public class OperationReportServiceImpl implements  IOperationReportService {
         productDataVO.setStartTime(seasonTimeVO.getStartTime());//季度开始时间
         productDataVO.setEndTime( seasonTimeVO.getEndTime());//季度结束时间
         //水务公司总数
-        String sql = "select count(1) from sys_depart where depart_type  = 1";
+        String sql = "select count(1) from sys_depart where depart_type  = 1  where id in ("+JSUtils.quoteEach(departId,",")+")";
         String deptartCount = getJdbcTemplate().queryForObject(sql,String.class);
         productDataVO.setDeptartCount( deptartCount );
 
         long dayNum  = DateUtils.differenceDay(seasonTimeVO.getStartTime(),seasonTimeVO.getEndTime());//天数
-        String departId = BaseContextHandler.getDeparts();
+       // String departId = BaseContextHandler.getDeparts();
         productDataVO.setSequentialProgress("基本满足时序进度");
         // ysfsl:月收费水量 ;  yyf:月药费 ; ysjsl:月实际水量
         String dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysfsl,ysjsl,yyf", departId, seasonTimeVO.getStartTime(),seasonTimeVO.getEndTime());

@@ -19,6 +19,9 @@ public class ProductDataVO {
     @ApiModelProperty(value = "去年")
     private Integer  lastYear;
 
+    @ApiModelProperty(value = "今年")
+    private Integer  year;
+
     @ApiModelProperty(value = "季度开始时间")
     private String  startTime;
     @ApiModelProperty(value = "季度结束时间")

@@ -100,5 +100,5 @@ public interface SysFactoryInfoMapper extends BaseMapper<SysFactoryInfo> {
 	 * 获取总的设计规模
 	 * @return
 	 */
-    public String querySumProScale();
+    public String querySumProScale(@Param("departIds") String departIds);
 }

@@ -495,5 +495,9 @@
     <!-- 获取总的设计规模-->
     <select id="querySumProScale" resultType="java.lang.String">
         select sum(pro_scale) from sys_factory_info
+        where  1=1
+        <if test="departIds != null  and  departIds != ''">
+            and depart_id in (${departIds})
+        </if>
     </select>
 </mapper>

@@ -108,7 +108,7 @@ public interface ISysFactoryInfoService extends IService<SysFactoryInfo> {
 	 * 获取总的设计规模
 	 * @return
 	 */
-	public String querySumProScale();
+	public String querySumProScale(String departIds);
 
 	/**
 	 * 获取进出水标准

@@ -681,8 +681,8 @@ public class SysFactoryInfoServiceImpl extends ServiceImpl<SysFactoryInfoMapper,
      * 获取总的设计规模
      * @return
      */
-    public String querySumProScale(){
-        return sysFactoryInfoMapper.querySumProScale();
+    public String querySumProScale(String departIds){
+        return sysFactoryInfoMapper.querySumProScale(departIds);
     }
 
     @Override