Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

leiSP-admin/src/main/java/com/sooka/web/controller/system/SysUserController.java

@@ -1,6 +1,7 @@
 package com.sooka.web.controller.system;
 
 import java.util.List;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import com.business.slfh.tools.PinYinUtil;
@@ -9,7 +10,9 @@ import com.sooka.common.core.page.PageDomain;
 import com.sooka.common.core.page.TableSupport;
 import com.sooka.common.utils.StringUtils;
 import com.sooka.common.utils.sql.SqlUtil;
+import com.sooka.framework.util.UserPasswordR;
 import com.sooka.system.mapper.SysUserMapper;
+import org.apache.catalina.User;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -147,7 +150,13 @@ public class SysUserController extends BaseController
         {
             return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
         }
-//        else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+        boolean isMatch = Pattern.matches(UserPasswordR.RegPass, user.getPassword());
+        if(!isMatch){
+            return error(UserPasswordR.RegPassTrs);
+        }
+
+        //
+// else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
 //        {
 //            return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
 //        }
@@ -207,7 +216,6 @@ public class SysUserController extends BaseController
         mmap.put("user", userService.selectUserById(userId));
         return prefix + "/resetPwd";
     }
-
     @RequiresPermissions("system:user:resetPwd")
     @Log(title = "重置密码", businessType = BusinessType.UPDATE)
     @PostMapping("/resetPwd")
@@ -216,7 +224,12 @@ public class SysUserController extends BaseController
     {
         userService.checkUserAllowed(user);
         user.setSalt(ShiroUtils.randomSalt());
+        boolean isMatch = Pattern.matches(UserPasswordR.RegPass, user.getPassword());
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
+        String msg = "", username = user.getLoginName(), password = user.getPassword();
+        if(!isMatch){
+            return error(UserPasswordR.RegPassTrs);
+        }
         if (userService.resetUserPwd(user) > 0)
         {
             if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue())

leiSP-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@ spring:
             # 主库数据源
             master:
 
-                url: jdbc:mysql://117.78.49.164:53306/hnly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://117.78.49.164:63306/hnly?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 ##                url: jdbc:mysql://218.27.1.157:53306/jian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: sys200888

leiSP-framework/src/main/java/com/sooka/framework/shiro/service/SysRegisterService.java

@@ -1,6 +1,7 @@
 package com.sooka.framework.shiro.service;
 
 import com.sooka.framework.manager.AsyncManager;
+import com.sooka.framework.util.UserPasswordR;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -14,9 +15,11 @@ import com.sooka.framework.util.ShiroUtils;
 import com.sooka.system.domain.SysUser;
 import com.sooka.system.service.ISysUserService;
 
+import java.util.regex.Pattern;
+
 /**
  * 注册校验方法
- * 
+ *
  * @author lei_wang
  */
 @Component
@@ -34,7 +37,7 @@ public class SysRegisterService
     public String register(SysUser user)
     {
         String msg = "", username = user.getLoginName(), password = user.getPassword();
-
+        boolean isMatch = Pattern.matches(UserPasswordR.RegPass, password);
         if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA)))
         {
             msg = "验证码错误";
@@ -47,10 +50,13 @@ public class SysRegisterService
         {
             msg = "用户密码不能为空";
         }
-        else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
-        {
-            msg = "密码长度必须在5到20个字符之间";
+//        else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+//                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
+//        {
+//            msg = "密码长度必须在5到20个字符之间";
+//        }
+        else if(!isMatch){
+            msg = UserPasswordR.RegPassTrs;
         }
         else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                 || username.length() > UserConstants.USERNAME_MAX_LENGTH)

leiSP-framework/src/main/java/com/sooka/framework/util/UserPasswordR.java

@@ -0,0 +1,7 @@
+package com.sooka.framework.util;
+
+public class UserPasswordR {
+    public static String RegPass ="(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,}";
+    public static String RegPassTrs ="密码长度至少8位，必须包含数字，大小写字母，特殊符号[?=.*[!@#$%^&*]";
+
+}

mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

@@ -10,55 +10,106 @@ import java.util.List;
 
 public interface Visualization_Event_Mapper {
     int Visualization_Report_Event_Count(@Param("DEPT_ID") String DEPT_ID);
+
     int Visualization_All_Event_Count(@Param("DEPT_ID") String DEPT_ID);
+
     int Visualization_User_Count(@Param("DEPT_ID") String DEPT_ID);
+
     int Visualization_Car_Count(@Param("DEPT_ID") String DEPT_ID);
+
     int Visualization_Tower_Count(@Param("DEPT_ID") String DEPT_ID);
+
     int Visualization_Camera_Count(Visualization_Camera camera);
+
     Visualization_Camera getNearestCamera();
-    List<Visualization_Event> Visualization_Pending_List(@Param("eventName") String eventName,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("DEPT_ID") String DEPT_ID);
+
+    List<Visualization_Event> Visualization_Pending_List(@Param("eventName") String eventName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("DEPT_ID") String DEPT_ID);
+
     List<Visualization_Event> Visualization_Pending_List(Visualization_Event event);
+
     Visualization_Event Visualization_getOne(@Param("eventId") String eventId, @Param("reservePlanType") String reservePlanType);
-    List<Visualization_Attach> Visualization_Get_Imagelist( String eventId);
+
+    List<Visualization_Attach> Visualization_Get_Imagelist(String eventId);
+
     List<Visualization_EventProcess> Visualization_Get_EventProcess(String eventId);
-    List<Visualization_Tower> Visualization_Tower(@Param("DEPT_ID") String DEPT_ID,@Param("towerName") String towerName,@Param("superMapId") String superMapId);
+
+    List<Visualization_Tower> Visualization_Tower(@Param("DEPT_ID") String DEPT_ID, @Param("towerName") String towerName, @Param("superMapId") String superMapId);
+
     List<Visualization_Camera> Visualization_Camera(Visualization_Camera camera);
+
     Visualization_Camera_Count getVisualization_Camera_Count(Visualization_Camera camera);
+
     Visualization_SYSQ_Count getSourceWaterCount();
+
     int getCanalCount();
+
     List<Visualization_SourceWater> Visualization_SourceWater();
+
     List<Visualization_Canal> Visualization_Canal();
+
     Visualization_Forest_Count Visualization_Forest_Count();
+
     List<Visualization_Forest> Visualization_Forest();
+
     Visualization_Forest_Count Visualization_Forest_Detail_Count();
+
     Visualization_Car_Count getVisualization_Car_Count();
+
     Visualization_Car_Count getVisualization_Car_Repair_Count();
+
     List<Visualization_Car> Visualization_Car(Visualization_Car car);
+
     List<Visualization_Car_Repair> Visualization_Car_Repair();
+
     Visualization_User_Count getVisualization_User_Count(@Param("DEPT_ID") String DEPT_ID);
+//    Visualization_User_Count getVisualization_User_Count();
+
     List<Visualization_User> Visualization_User(Visualization_User user);
+
     Visualization_User getOne(Visualization_User vu);
+
     List<Visualization_Event> getAllFire(@Param("DEPT_ID") String DEPT_ID);
-    List<Visualization_Event> getAllOthers(@Param("reservePlanType") String reservePlanType,@Param("DEPT_ID") String DEPT_ID);
+
+    List<Visualization_Event> getAllOthers(@Param("reservePlanType") String reservePlanType, @Param("DEPT_ID") String DEPT_ID);
+
     List<Visualization_Tower> getAllObservationTower(@Param("DEPT_ID") String DEPT_ID);
+
     List<Visualization_Camera> getAllCamera(@Param("DEPT_ID") String DEPT_ID);
-//    List<Visualization_Camera> getAllCamera(@Param("deptIds") List<String> deptIds,@Param("cameraModels") List<String> cameraModels);
+
+    //    List<Visualization_Camera> getAllCamera(@Param("deptIds") List<String> deptIds,@Param("cameraModels") List<String> cameraModels);
     List<Visualization_Camera> getAllCamera(Visualization_Camera visualizationCamera);
+
     List<Visualization_User> getAllUser();
+
     Visualization_Plan getVisualizationPlanByLevel(@Param("reservePlanLevel") String reservePlanLevel);
+
     List<Visualization_Car_Count> getSuperMap_Car_Count();
-    List<Visualization_Trajectory> getUserTrajectory(@Param("userId") String userId,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+    List<Visualization_Trajectory> getUserTrajectory(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
     Visualization_Tower getOneTower(@Param("towerId") String towerId);
+
     Visualization_Level getResLevel();
+
     void insertRoadBlocks(Visualization_RoadBlocks roadBlocks);
+
     void deleteRoadBlocks(Visualization_RoadBlocks roadBlocks);
+
     List<Visualization_RoadBlocks> getRoadBlocks();
-    void updateEventSign(@Param("eventId") String eventId,@Param("reservePlanType") String reservePlanType);
+
+    void updateEventSign(@Param("eventId") String eventId, @Param("reservePlanType") String reservePlanType);
+
     int getRoleMenu(@Param("roles") List<SysRole> roles);
-    List<Visualization_XF_Resources> getXfResources(@Param("typeArr") String [] typeArr,@Param("DEPT_ID") String DEPT_ID);
+
+    List<Visualization_XF_Resources> getXfResources(@Param("typeArr") String[] typeArr, @Param("DEPT_ID") String DEPT_ID);
+
     void insertWrjGj(Visualizaiton_UAV uav);
+
     void deleteWrjGjs();
+
     List<Visualizaiton_UAV> getWrjGjs();
+
     List<Visualization_Event_Count> Visualization_Event_Each_Count(@Param("DEPT_ID") String DEPT_ID);
+
     List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count(@Param("DEPT_ID") String DEPT_ID);
 }

mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java

@@ -9,6 +9,7 @@ import com.business.slfh.visualization.event.domain.*;
 import com.business.slfh.visualization.event.mapper.Visualization_Event_Mapper;
 import com.business.slfh.visualization.event.service.Visualization_Event_Service;
 import com.sooka.common.annotation.DataScope;
+import com.sooka.common.annotation.DataSource;
 import com.sooka.system.domain.SysRole;
 import com.sooka.system.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
@@ -56,11 +57,13 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
     }
 
     @Override
-    public List<Visualization_Event> Visualization_Pending_List(String eventName, String startTime, String endTime,String dept_id) {
-        return Visualization_Event_Mapper.Visualization_Pending_List(eventName, startTime ,endTime ,dept_id);
+    public List<Visualization_Event> Visualization_Pending_List(String eventName, String startTime, String endTime, String dept_id) {
+        return Visualization_Event_Mapper.Visualization_Pending_List(eventName, startTime, endTime, dept_id);
     }
+
     @Override
-    public List<Visualization_Event> Visualization_Pending_List(Visualization_Event event){
+    @DataScope(deptAlias = "t")
+    public List<Visualization_Event> Visualization_Pending_List(Visualization_Event event) {
         return Visualization_Event_Mapper.Visualization_Pending_List(event);
     }
 
@@ -71,173 +74,213 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
     }
 
     @Override
-    public Visualization_Event Visualization_getOne(String eventId, String reservePlanType){
-        return Visualization_Event_Mapper.Visualization_getOne(eventId,reservePlanType);
+    public Visualization_Event Visualization_getOne(String eventId, String reservePlanType) {
+        return Visualization_Event_Mapper.Visualization_getOne(eventId, reservePlanType);
     }
+
     @Override
-    public List<Visualization_Attach> Visualization_Get_Imagelist(String eventId){
+    public List<Visualization_Attach> Visualization_Get_Imagelist(String eventId) {
         return Visualization_Event_Mapper.Visualization_Get_Imagelist(eventId);
     }
+
     @Override
-    public List<Visualization_EventProcess> Visualization_Get_EventProcess(String eventId){
+    public List<Visualization_EventProcess> Visualization_Get_EventProcess(String eventId) {
         return Visualization_Event_Mapper.Visualization_Get_EventProcess(eventId);
     }
+
     @Override
-    public List<Visualization_Tower> Visualization_Tower(String towerName,String superMapId){
-        return Visualization_Event_Mapper.Visualization_Tower(userInfoUtil.getLoginUserInfo().getDeptId().toString(),towerName,superMapId);
+    public List<Visualization_Tower> Visualization_Tower(String towerName, String superMapId) {
+        return Visualization_Event_Mapper.Visualization_Tower(userInfoUtil.getLoginUserInfo().getDeptId().toString(), towerName, superMapId);
     }
+
     @Override
     @DataScope(deptAlias = "t")
-    public List<Visualization_Camera> Visualization_Camera(Visualization_Camera camera){
+    public List<Visualization_Camera> Visualization_Camera(Visualization_Camera camera) {
         return Visualization_Event_Mapper.Visualization_Camera(camera);
     }
+
     @Override
-    public Visualization_Camera_Count getVisualization_Camera_Count(Visualization_Camera camera){
+    public Visualization_Camera_Count getVisualization_Camera_Count(Visualization_Camera camera) {
         return Visualization_Event_Mapper.getVisualization_Camera_Count(camera);
     }
+
     @Override
-    public Visualization_SYSQ_Count getSourceWaterCount(){
+    public Visualization_SYSQ_Count getSourceWaterCount() {
         return Visualization_Event_Mapper.getSourceWaterCount();
     }
+
     @Override
-    public int getCanalCount(){
+    public int getCanalCount() {
         return Visualization_Event_Mapper.getCanalCount();
     }
+
     @Override
-    public List<Visualization_SourceWater> Visualization_SourceWater(){
+    public List<Visualization_SourceWater> Visualization_SourceWater() {
         return Visualization_Event_Mapper.Visualization_SourceWater();
     }
+
     @Override
-    public List<Visualization_Canal> Visualization_Canal(){
+    public List<Visualization_Canal> Visualization_Canal() {
         return Visualization_Event_Mapper.Visualization_Canal();
     }
+
     @Override
-    public Visualization_Forest_Count Visualization_Forest_Count(){
+    public Visualization_Forest_Count Visualization_Forest_Count() {
         return Visualization_Event_Mapper.Visualization_Forest_Count();
     }
+
     @Override
-    public List<Visualization_Forest> Visualization_Forest(){
+    public List<Visualization_Forest> Visualization_Forest() {
         return Visualization_Event_Mapper.Visualization_Forest();
     }
+
     @Override
-    public Visualization_Forest_Count Visualization_Forest_Detail_Count(){
+    public Visualization_Forest_Count Visualization_Forest_Detail_Count() {
         return Visualization_Event_Mapper.Visualization_Forest_Detail_Count();
     }
+
     @Override
-    public Visualization_Car_Count getVisualization_Car_Count(){
+    public Visualization_Car_Count getVisualization_Car_Count() {
         return Visualization_Event_Mapper.getVisualization_Car_Count();
     }
+
     @Override
-    public Visualization_Car_Count getVisualization_Car_Repair_Count(){
+    public Visualization_Car_Count getVisualization_Car_Repair_Count() {
         return Visualization_Event_Mapper.getVisualization_Car_Repair_Count();
     }
+
     @Override
-    public List<Visualization_Car> Visualization_Car(Visualization_Car car){
+    public List<Visualization_Car> Visualization_Car(Visualization_Car car) {
         return Visualization_Event_Mapper.Visualization_Car(car);
     }
+
     @Override
-    public List<Visualization_Car_Repair> Visualization_Car_Repair(){
+    public List<Visualization_Car_Repair> Visualization_Car_Repair() {
         return Visualization_Event_Mapper.Visualization_Car_Repair();
     }
+
     @Override
-    public Visualization_User_Count getVisualization_User_Count(){
+    public Visualization_User_Count getVisualization_User_Count() {
         return Visualization_Event_Mapper.getVisualization_User_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
+//        return Visualization_Event_Mapper.getVisualization_User_Count();
     }
+
     @Override
-    public List<Visualization_User> Visualization_User(Visualization_User user){
+    @DataScope(deptAlias = "DEPT")
+    public List<Visualization_User> Visualization_User(Visualization_User user) {
         user.setUSER_DEPTID(userInfoUtil.getLoginUserInfo().getDeptId().toString());
         return Visualization_Event_Mapper.Visualization_User(user);
     }
+
     @Override
-    public Visualization_User getOne(Visualization_User vu){
+    public Visualization_User getOne(Visualization_User vu) {
         return Visualization_Event_Mapper.getOne(vu);
     }
 
     @Override
-    public List<Visualization_Event> getAllFire(String DEPT_ID){
+    public List<Visualization_Event> getAllFire(String DEPT_ID) {
         return Visualization_Event_Mapper.getAllFire(DEPT_ID);
     }
+
     @Override
-    public List<Visualization_Event> getAllOthers(String reservePlanType,String DEPT_ID){
-        return Visualization_Event_Mapper.getAllOthers(reservePlanType,DEPT_ID);
+    public List<Visualization_Event> getAllOthers(String reservePlanType, String DEPT_ID) {
+        return Visualization_Event_Mapper.getAllOthers(reservePlanType, DEPT_ID);
     }
+
     @Override
-    public List<Visualization_Tower> getAllObservationTower(){
+    public List<Visualization_Tower> getAllObservationTower() {
         return Visualization_Event_Mapper.getAllObservationTower(userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
+
     @Override
-    public List<Visualization_Camera> getAllCamera(Visualization_Camera camera){
+    public List<Visualization_Camera> getAllCamera(Visualization_Camera camera) {
         return Visualization_Event_Mapper.getAllCamera(camera);
 
     }
+
     @Override
-    public List<Visualization_User> getAllUser(){
+    public List<Visualization_User> getAllUser() {
         return Visualization_Event_Mapper.getAllUser();
     }
+
     @Override
-    public Visualization_Plan getVisualizationPlanByLevel(String reservePlanLevel){
+    public Visualization_Plan getVisualizationPlanByLevel(String reservePlanLevel) {
         return Visualization_Event_Mapper.getVisualizationPlanByLevel(reservePlanLevel);
     }
+
     @Override
-    public List<Visualization_Car_Count> getSuperMap_Car_Count(){
+    public List<Visualization_Car_Count> getSuperMap_Car_Count() {
         return Visualization_Event_Mapper.getSuperMap_Car_Count();
     }
+
     @Override
-    public List<Visualization_Trajectory> getUserTrajectory(String userId,String startTime,String endTime){
-        return Visualization_Event_Mapper.getUserTrajectory(userId,startTime,endTime);
+    public List<Visualization_Trajectory> getUserTrajectory(String userId, String startTime, String endTime) {
+        return Visualization_Event_Mapper.getUserTrajectory(userId, startTime, endTime);
     }
 
     @Override
-    public Visualization_Tower getOneTower(String towerId){
+    public Visualization_Tower getOneTower(String towerId) {
         return Visualization_Event_Mapper.getOneTower(towerId);
     }
-    public Visualization_Level getResLevel(){
+
+    public Visualization_Level getResLevel() {
         return Visualization_Event_Mapper.getResLevel();
     }
+
     @Override
-    public void insertRoadBlocks(Visualization_RoadBlocks roadBlocks){
+    public void insertRoadBlocks(Visualization_RoadBlocks roadBlocks) {
         Visualization_Event_Mapper.insertRoadBlocks(roadBlocks);
     }
+
     @Override
-    public void deleteRoadBlocks(Visualization_RoadBlocks roadBlocks){
+    public void deleteRoadBlocks(Visualization_RoadBlocks roadBlocks) {
         Visualization_Event_Mapper.deleteRoadBlocks(roadBlocks);
     }
+
     @Override
-    public List<Visualization_RoadBlocks> getRoadBlocks(){
+    public List<Visualization_RoadBlocks> getRoadBlocks() {
         return Visualization_Event_Mapper.getRoadBlocks();
     }
+
     @Override
-    public void updateEventSign(String eventId,String reservePlanType){
-        Visualization_Event_Mapper.updateEventSign(eventId,reservePlanType);
+    public void updateEventSign(String eventId, String reservePlanType) {
+        Visualization_Event_Mapper.updateEventSign(eventId, reservePlanType);
     }
+
     @Override
-    public int getRoleMenu(){
+    public int getRoleMenu() {
         List<SysRole> roles = userInfoUtil.getLoginUserInfo().getRoles();
-        if(roles.size() == 0)return 0;
+        if (roles.size() == 0) return 0;
         return Visualization_Event_Mapper.getRoleMenu(roles);
     }
+
     @Override
-    public List<Visualization_XF_Resources> getXfResources(String [] typeArr,String DEPT_ID){
-        return Visualization_Event_Mapper.getXfResources(typeArr,DEPT_ID);
+    public List<Visualization_XF_Resources> getXfResources(String[] typeArr, String DEPT_ID) {
+        return Visualization_Event_Mapper.getXfResources(typeArr, DEPT_ID);
     }
+
     @Override
-    public void insertWrjGj(Visualizaiton_UAV uav){
+    public void insertWrjGj(Visualizaiton_UAV uav) {
         Visualization_Event_Mapper.insertWrjGj(uav);
     }
+
     @Override
-    public void deleteWrjGjs(){
+    public void deleteWrjGjs() {
         Visualization_Event_Mapper.deleteWrjGjs();
     }
+
     @Override
-    public List<Visualizaiton_UAV> getWrjGjs(){
+    public List<Visualizaiton_UAV> getWrjGjs() {
         return Visualization_Event_Mapper.getWrjGjs();
     }
+
     @Override
-    public List<Visualization_Event_Count> Visualization_Event_Each_Count(){
+    public List<Visualization_Event_Count> Visualization_Event_Each_Count() {
         return Visualization_Event_Mapper.Visualization_Event_Each_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
+
     @Override
-    public List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count(){
+    public List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count() {
         return Visualization_Event_Mapper.Visualization_ALL_Event_Each_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
 

mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

@@ -609,6 +609,8 @@
             <if test="USER_DEPTID != null and USER_DEPTID != ''">
                 AND DEPT_ID = #{USER_DEPTID}
             </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
             order by reserveplan_type asc ,time desc
     </select>
 
@@ -827,7 +829,7 @@
         select * from t_bus_carrepair where car_id =#{carId};
     </select>
 
-    <select id="getVisualization_User_Count" resultMap="Visualization_User_Count">
+    <select id="getVisualization_User_Count"  resultMap="Visualization_User_Count">
         SELECT
             COUNT(1) ZRS,
             COUNT(CASE WHEN OLSTATUS='1' THEN 1 ELSE NULL END) ZXRS,
@@ -849,12 +851,14 @@
 --             LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
             LEFT JOIN T_BUS_LEAVEINFO LE ON U.USER_ID=LE.USER_ID
             WHERE 1=1 and u.del_flag = '0'
+
             AND U.DEPT_ID IN (
                 <include refid="Depts">
                     <property name="dept_id" value="#{DEPT_ID}"/>
                 </include>
             )
-        )T
+        )T where 1=1
+
     </select>
 
     <select id="Visualization_User" parameterType="com.business.slfh.visualization.event.domain.Visualization_User"
@@ -889,6 +893,8 @@
         <if test="DEPT_ID != null and DEPT_ID != ''">
             AND DEPT.DEPT_ID LIKE '%${DEPT_ID}%'
         </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by OLSTATUS desc
     </select>
 

mybusiness/src/main/resources/templates/business/manager/cameramanager/add.html

@@ -101,17 +101,17 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">政府部门：</label>
+            <label class="col-sm-3 control-label">摄像头所属部门：</label>
             <div class="col-sm-8">
                 <input name="orgDeptName" onclick="selectOrgDeptTree()" id="orgTreeName" type="text"
-                       placeholder="请选择归属政府部门" class="form-control" readonly>
+                       placeholder="请选择摄像头所属部门" class="form-control" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">林场部门：</label>
+            <label class="col-sm-3 control-label">事件上报部门：</label>
             <div class="col-sm-8">
                 <input name="deptName" onclick="selectDeptTree()" id="deptTreeName" type="text"
-                       placeholder="请选择归属林场部门" class="form-control" readonly>
+                       placeholder="请选择事件上报部门" class="form-control" readonly>
             </div>
         </div>
         <div class="form-group">

mybusiness/src/main/resources/templates/business/manager/cameramanager/edit.html

@@ -116,18 +116,18 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">政府部门：</label>
+            <label class="col-sm-3 control-label">摄像头所属部门：</label>
             <div class="col-sm-8">
                 <input name="orgDeptName" th:field="*{orgDeptName}" onclick="selectOrgDeptTree()" id="orgTreeName"
                        type="text"
-                       placeholder="请选择归属政府部门" class="form-control" readonly>
+                       placeholder="请选择摄像头所属部门" class="form-control" readonly>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">林场部门：</label>
+            <label class="col-sm-3 control-label">事件上报部门：</label>
             <div class="col-sm-8">
                 <input name="deptName" th:field="*{deptName}" onclick="selectDeptTree()" id="deptTreeName" type="text"
-                       placeholder="请选择归属林场部门" class="form-control" readonly>
+                       placeholder="请选择事件上报部门" class="form-control" readonly>
             </div>
         </div>
         <div class="form-group">

mybusiness/src/main/resources/templates/business/manager/cameramanager/index.html

@@ -174,13 +174,13 @@
                     field: 'address',
                     title: '详细地址'
                 },
-                // {
-                //     field: 'orgDeptName',
-                //     title: '所属政府部门'
-                // },
+                {
+                    field: 'orgDeptName',
+                    title: '摄像头所属部门'
+                },
                 {
                     field: 'deptName',
-                    title: '所属部门'
+                    title: '事件上报部门'
                 },
                 {
                     title: '操作',