添加用户信息和部门信息到缓存

VisualInspection/js/config.js

@@ -1,4 +1,4 @@
-var base_ui_url = "http://localhost:8080/";
+var base_ui_url = "http://localhost:8081/";
 var base_server_url = "http://localhost:8089/";
 
 

VisualInspection/js/mytask/checkDetail.js

@@ -0,0 +1,124 @@
+function initCheck(){
+    
+        // 仅选择日期
+        $("#start-time").datetimepicker({
+            language: "zh-CN",
+            weekStart: 1,
+            todayBtn: 1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker({
+            language: "zh-CN",
+            weekStart: 1,
+            todayBtn: 1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        if($.checkTask) {
+            setFeSelect("#fsList",$.checkTask.deptid);
+            setLaneSelect("#lane",$.checkTask.checked_location);
+            get_common_service('user/getUserById/'+$.checkTask.checked_person, null, function(data){
+                $("#checked_person").html(data.truename);
+            }) 
+            //查询评分情况
+            queryScores();
+        }
+}
+    // 使用data参数更新数据：
+    function queryScores(){
+        var data = {
+            "task_id": $.checkTask.id
+        }
+        var cols = [
+                    {width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
+                    {width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down',field: 'content'},
+                    {width: 80, text: '分数', type: 'string', flex: true, colClass: '',field: 'check_item_score'},
+                    {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                        oper:[
+                            {func:'showEditScore',text:'修改',icon_class:'icon-edit'},
+                            {func:'deleteScore',text:'删除',icon_class:'icon-remove-circle'}
+                        ]
+                    }
+                ];
+        
+        // var pager = {
+        //     page_size:10
+        // }
+        $('.datatable').mytable({'cols':cols,
+                                'url':"/score/getScoreList/",
+                                'param':data}
+                                );
+    }
+    function showEditScore(id){
+        // deleteItem4Common(id,"/score/delete/",queryScores);
+        var rowData=getItemByIdFromArr(id,$('.datatable').mytable('getTableData'));
+        showPics(rowData.pics);
+    }
+
+    function deleteScore(id){
+        deleteItem4Common(id,"/score/delete/",queryScores);
+    }
+
+    function showPics(pics){
+        var picStr='';
+        $('#img_container').html(picStr);
+        if(pics){
+            var picArr = pics.split(',');
+            for(var i in picArr){
+                var pic = '<div id="img_item_'+i+'" class="col-md-4 col-sm-6 col-lg-3">'
+                    +  '<a href="javascript:void(0)" onclick="removeImg(\'#img_item_'+i+'\')" style="float:right;position:absolute;z-index:100;"><span class="label label-danger"><i class="icon icon-remove-circle"></i> 删除</span></a>'
+                    +  '<a class="card lightbox-toggle" href="'+picArr[i]+'" style="position:absolute">'
+                    +      '<img src="'+picArr[i]+'" alt="">'
+                    +  '</a>'
+                    +'</div>';
+                picStr+=pic;
+            }
+            $('#img_container').html(picStr);
+            $('a.lightbox-toggle').lightbox();
+        }
+    }
+
+    function removeImg(img_id){
+        $(img_id).remove();
+    }
+
+    function clearAllImg(){
+        $('#img_container').empty();
+    }
+    function showPre(id){
+        // $('#myModal').modal({name:"dd"});
+        changePage("/view/mytask/taskDetail.html");
+    }
+
+    function saveValidReason(){
+        alert("提交成功！");
+        $('#validSubmitWin').modal('toggle');
+    }
+    function changePerson(id){
+        $('#checkedPerson').html(id);
+        $('#changePersonWin').modal('toggle');
+    }
+
+    function score(score){
+        alert("扣分："+score);
+        $('#scoreWin').modal('toggle');
+    }
+
+    function refuseApply(){
+        alert("拒绝申请");
+        $('#refuseApplyWin').modal('toggle');
+    }
+
+    function agreeApply(){
+        alert("同意申请");
+    }

VisualInspection_server/src/main/java/com/xintong/SystemInit.java

@@ -0,0 +1,41 @@
+package com.xintong;
+
+import java.util.List;
+
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.service.DepartmentService;
+import com.xintong.visualinspection.service.UserService;
+import com.xintong.visualinspection.service.impl.DepartmentServiceImpl;
+import com.xintong.visualinspection.service.impl.UserServiceImpl;
+import com.xintong.visualinspection.util.CacheUtil;
+
+public class SystemInit implements ApplicationListener<ContextRefreshedEvent> {
+
+	UserService userService;
+	DepartmentService deptService;
+	
+	private static final org.slf4j.Logger logger = LoggerFactory.getLogger(SystemInit.class);
+	@Override
+	public void onApplicationEvent(ContextRefreshedEvent arg0) {
+		
+		userService = arg0.getApplicationContext().getBean(UserServiceImpl.class);
+		//加载用户信息
+		List<User> userList = userService.getAll();
+		for(User user:userList){
+			CacheUtil.userMap.put(user.getId(), user);
+		}
+		logger.info("加载用户信息成功，数据数："+CacheUtil.userMap.size());
+		//加载部门信息
+		deptService = arg0.getApplicationContext().getBean(DepartmentServiceImpl.class);
+		List<Organ> deptList = deptService.getAll();
+		for(Organ organ:deptList){
+			CacheUtil.deptMap.put(organ.getId(), organ);
+		}
+		logger.info("加载部门信息成功，数据数："+CacheUtil.deptMap.size());
+	}
+}

VisualInspection_server/src/main/java/com/xintong/VideocheckApplication.java

@@ -20,7 +20,7 @@ public class VideocheckApplication {
 	public static void main(String[] args) {
 		ParserConfig.getGlobalInstance().addAccept("com.xintong.");
 		ParserConfig.getGlobalInstance().addAccept("org.springframework.security.core.");
-        
+
         SpringApplication.run(VideocheckApplication.class, args);
 	}
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -13,6 +13,7 @@ import com.xintong.visualinspection.bean.Organ;
  */
 @Mapper
 public interface DepartmentDao  {
+	public List<Organ> getAll();
     public List<Organ> getOrgan(Organ organ);
     public void insert(Organ organ);
     public void update(Organ organ);

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -23,13 +23,12 @@
         <result column="entrance_etc" property="entrance_etc" jdbcType="VARCHAR" />
         <result column="deptid" property="deptid" jdbcType="VARCHAR" />
     </resultMap>
-   <!--  <select id="getAll" resultMap="BaseResultMap"  >
-        SELECT
-        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status 
+    <select id="getAll" resultMap="BaseResultMap"  >
+        SELECT * 
         FROM t_sys_organ
     </select>
 
-    <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+    <!-- <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
         SELECT
         id,organname,remark,parentid,classtype,organcode,isshow,deptype,status
         FROM t_sys_organ

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/DepartmentService.java

@@ -9,6 +9,8 @@ import com.xintong.visualinspection.bean.Organ;
  * 文件名：UserService 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public interface DepartmentService {
+	public List<Organ> getAll();
+	
 	public List<Organ> getOrgans(Organ organ);
 
 	public void insert(Organ organ);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/DepartmentServiceImpl.java

@@ -85,4 +85,10 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 		return departmentDao.getAllFS();
 	}
 
+	@Override
+	public List<Organ> getAll() {
+		// TODO Auto-generated method stub
+		return departmentDao.getAll();
+	}
+
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -1,15 +1,5 @@
 package com.xintong.visualinspection.service.impl;
 
-import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.dao.cluster.UserInfoDao;
-import com.xintong.visualinspection.dao.master.PermissionDao;
-import com.xintong.visualinspection.dao.master.UserDao;
-import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
-import com.xintong.visualinspection.service.BaseService;
-import com.xintong.visualinspection.service.UserService;
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,9 +16,12 @@ import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.cluster.UserInfoDao;
 import com.xintong.visualinspection.dao.master.PermissionDao;
 import com.xintong.visualinspection.dao.master.UserDao;
+import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.UserService;
 
+import lombok.Data;
+
 /**
  * 文件名：UserServiceImpl
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/CacheUtil.java

@@ -0,0 +1,14 @@
+package com.xintong.visualinspection.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
+
+public class CacheUtil {
+	
+	public static Map<Integer,User> userMap = new HashMap<Integer,User>();
+	
+	public static Map<Integer,Organ> deptMap = new HashMap<Integer,Organ>();
+}

VisualInspection_server/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8089
 spring.thymeleaf.cache=false
-
+context.listener.classes=com.xintong.SystemInit
 
 master.datasource.url = jdbc:mysql://git_xt.git.topm.win:9001/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root