浦东公交计划调度功能优化

1、首页提示人员停用信息后端逻辑修正，改成当前时间开始的排班计划中有人员停用的线路，排班日期信息，并且当前用户已经分配了运营计划管理模块目录

浦东公交计划调度功能优化
1、首页提示人员停用信息后端逻辑修正，改成当前时间开始的排班计划中有人员停用的线路，排班日期信息，并且当前用户已经分配了运营计划管理模块目录
徐烜
1 parent 096158f6
Showing 4 changed files with 67 additions and 57 deletions
src/main/java/com/bsth/controller/schedule/core/legacy/EmployeeConfigInfoController.java
src/main/java/com/bsth/service/schedule/EmployeeConfigInfoService.java
src/main/java/com/bsth/service/schedule/impl/EmployeeConfigInfoServiceImpl.java
src/main/resources/static/pages/home.html
@@ -61,13 +61,10 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
     }
     @RequestMapping(value = "/validate_get_destroy_info", method = RequestMethod.GET)
-    public Map<String, Object> validate_get_destroy_info(HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
-
+    public Map<String, Object> validate_get_destroy_info() {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            rtn.put("data", this.employeeConfigInfoService.validate_get_destroy_info(cmyAuths));
+            rtn.put("data", this.employeeConfigInfoService.validate_get_destory_info());
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (Exception exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -77,21 +74,17 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         return rtn;
     }
     @GetMapping(value = "/validate_get_destroy_info/download")
-    public void exportValidateGetDestroyInfo(
-            HttpServletRequest request,
-            HttpServletResponse response) throws Exception {
+    public void exportValidateGetDestroyInfo(HttpServletResponse response) throws Exception {
         // 流输出导出文件
         response.setHeader("content-type", "application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("人员配置停用信息.txt", "UTF-8"));
+        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("排班人员停用信息.txt", "UTF-8"));
         response.setContentType("application/octet-stream");
         try (
                 OutputStream os = response.getOutputStream();
                 PrintWriter printWriter = new PrintWriter(os);
         ) {
-            HttpSession session = request.getSession();
-            List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
-            List<String> infos = this.employeeConfigInfoService.validate_get_destroy_info(cmyAuths);
+            List<String> infos = this.employeeConfigInfoService.validate_get_destory_info();
             for (String info : infos) {
                 printWriter.println(info);
             }
@@ -30,8 +30,8 @@ public interface EmployeeConfigInfoService extends BService&lt;EmployeeConfigInfo, 
     void validate_jsy_destroy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
     // 验证售票员是否停用
     void validate_spy_destroy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
-    // 获取线路人员配置停用信息描述
-    List<String> validate_get_destroy_info(List<CompanyAuthority> companyAuthorityList);
+    // 获取人员停用信息（使用排班信息辅助判定）
+    List<String> validate_get_destory_info();
     void toggleCancel(Long id) throws ScheduleException;
     Long getMaxDbbm(Integer xlId);
@@ -4,6 +4,7 @@ import com.bsth.entity.Personnel;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Module;
 import com.bsth.repository.PersonnelRepository;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
 import com.bsth.service.schedule.EmployeeService;
@@ -11,11 +12,15 @@ import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
+import com.bsth.service.sys.ModuleService;
+import com.bsth.util.DateUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.ResultSetExtractor;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -277,51 +282,54 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
         }
     }
+    @Autowired
+    private ModuleService moduleService;
     @Transactional
     @Override
-    public List<String> validate_get_destroy_info(List<CompanyAuthority> companyAuthorityList) {
-        // 获取公司分公司权限代码
-        List<String> gs_fgs_dms = new ArrayList<>();
-        for (CompanyAuthority companyAuthority : companyAuthorityList) {
-            gs_fgs_dms.add(companyAuthority.getCompanyCode() + "_" + companyAuthority.getSubCompanyCode());
-        }
-
-        // 查询所有人员配置，不用in操作符，n+1查询慢，程序过滤
-        Map<String, Object> params = new HashMap<>();
-        List<EmployeeConfigInfo> employeeConfigInfoList_all = (List<EmployeeConfigInfo>) this.list(params);
-        List<EmployeeConfigInfo> employeeConfigInfoList = new ArrayList<>();
-        for (EmployeeConfigInfo employeeConfigInfo : employeeConfigInfoList_all) {
-            if (gs_fgs_dms.contains(employeeConfigInfo.getXl().getCgsbm())) {
-                employeeConfigInfoList.add(employeeConfigInfo);
+    public List<String> validate_get_destory_info() {
+        // 1、查找当前用户是否有运营计划管理，没有的话不分析是否有停用人鱼信息
+        List<Module> moduleList = this.moduleService.findByCurrentUser();
+        boolean hasPlanModule = false;
+        for (Module module : moduleList) {
+            if ("运营计划管理".equals(module.getName())) {
+                hasPlanModule = true;
+                break;
             }
         }
+        if (!hasPlanModule) {
+            return null;
+        }
-        // 停用信息
-        List<String> destroy_infos = new ArrayList<>();
-        String info_format = "线路[%s]中人员配置有停用人员，请处理！";
-        String info = "";
-        Integer xlId = null;
-        for (EmployeeConfigInfo employeeConfigInfo : employeeConfigInfoList) {
-            if (employeeConfigInfo.getJsy() != null &&
-                employeeConfigInfo.getJsy().getDestroy() != null &&
-                employeeConfigInfo.getJsy().getDestroy() == 1) { // 驾驶员判定是否停用
-                info = String.format(info_format, employeeConfigInfo.getXl().getName());
-                if (!destroy_infos.contains(info)) {
-                    destroy_infos.add(info);
-                }
-            }
-
-            if (employeeConfigInfo.getSpy() != null &&
-                employeeConfigInfo.getSpy().getDestroy() != null &&
-                employeeConfigInfo.getSpy().getDestroy() == 1) {
-                info = String.format(info_format, employeeConfigInfo.getXl().getName());
-                if (!destroy_infos.contains(info)) {
-                    destroy_infos.add(info);
-                }
+        // 2、计算从当前时间开始的排班计划中是否有停用人员
+        String sql =
+                "select distinct " +
+                "pinfo.xl_name xlName " +
+                ", pinfo.schedule_date scheduleDate " +
+                "from " +
+                "(" +
+                "select plan.xl_name, plan.schedule_date " +
+                "from bsth_c_s_sp_info plan " +
+                "left join bsth_c_personnel jsy on plan.j = jsy.id " +
+                "left join bsth_c_personnel spy on plan.s = spy.id " +
+                "where schedule_date >= ? " +
+                "and (jsy.destroy = 1 || spy.destroy = 1) " +
+                "order by plan.xl_name asc, plan.schedule_date asc " +
+                ") pinfo " +
+                "group by pinfo.xl_name, pinfo.schedule_date ";
+
+        Date currentDate = new Date(DateUtils.getTimestamp());
+        System.out.println(currentDate);
+        String info_format = "线路[%s][%s]排班中有人员已经停用，请及时处理！";
+        List<String> infoList = this.jdbcTemplate.query(sql, new Object[] {currentDate}, new RowMapper<String>() {
+            @Override
+            public String mapRow(ResultSet resultSet, int i) throws SQLException {
+                String xlName = resultSet.getString("xlName");
+                Date scheduleDate = new Date(resultSet.getDate("scheduleDate").getTime());
+                return String.format(info_format, xlName, DateFormatUtils.format(scheduleDate, "yyyy年MM月dd日"));
             }
-        }
+        });
-        return destroy_infos;
+        return infoList;
     }
     @Transactional
@@ -83,15 +83,24 @@
         success: function(rs) {
             if (rs && rs.status === "SUCCESS") {
                 if (rs.data && rs.data.length && rs.data.length > 0) {
-                    var text = "";
+                    var htmlText = "";
+                    var wrapData = [];
                     if (rs.data.length > 8) {
-                        text = "部分停用信息如下：</br>" + rs.data.slice(0, 8).join("</br>");
+                        htmlText = "<span style='font-weight: bold; font-style: italic; '>部分停用信息如下：</span></br>";
+                        wrapData = rs.data.slice(0, 8);
                     } else {
-                        text = "所有停用信息如下：</br>" + rs.data.join("</br>");
+                        htmlText = "<span style='font-weight: bold; font-style: italic; '>所有停用信息如下：</span></br>";
+                        wrapData = rs.data;
                     }
+                    $.each(wrapData, function(index, value) {
+                        wrapData[index] = "<span style='font-size: 14px;'>" + value + "</span>";
+                    });
+
+                    htmlText += wrapData.join("</br>");
+
                     swal({
-                        title: "人员配置停用信息",
-                        text: text,
+                        title: "排班人员停用信息",
+                        text: htmlText,
                         html: true,
                         type: "warning",
                         showCancelButton: true,