홈 탐색 도움말
가입하기 로그인
sunwei
/
thsjzt
Watch 1
Star 0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

归集数据分析 菜单配置部门

wangzhe 2 년 전
부모
9aa0bcd7c0
커밋
53d157615b
14개의 변경된 파일과 299개의 추가작업 그리고 59개의 파일을 삭제
분할 보기 변경상태 보기
  1. 15 0
      leiSP-admin/src/main/java/com/sooka/web/controller/system/SysDeptController.java
  2. 52 0
      leiSP-admin/src/main/resources/templates/system/dept/deptTree.html
  3. 33 0
      leiSP-admin/src/main/resources/templates/system/menu/edit.html
  4. 11 0
      leiSP-system/src/main/java/com/sooka/system/domain/SysMenu.java
  5. 15 7
      leiSP-system/src/main/resources/mapper/system/SysMenuMapper.xml
  6. 58 0
      mybusiness/src/main/java/com/business/controller/VisualizationController.java
  7. 6 0
      mybusiness/src/main/java/com/business/domain/ImputationData.java
  8. 19 0
      mybusiness/src/main/java/com/business/mapper/ImputationDataMapper.java
  9. 4 4
      mybusiness/src/main/java/com/sooka/applyData/controller/DataExamineController.java
  10. 8 0
      mybusiness/src/main/java/com/sooka/applyData/controller/DataRecordController.java
  11. 29 46
      mybusiness/src/main/java/com/sooka/system/service/impl/TUInterfaceinfoServiceImpl.java
  12. 47 0
      mybusiness/src/main/resources/mapper/imputationData/ImputationDataMapper.xml
  13. 1 1
      mybusiness/src/main/resources/templates/applyData/approval/approval.html
  14. 1 1
      mybusiness/src/main/resources/templates/applyData/examine/examine.html

+ 15 - 0
leiSP-admin/src/main/java/com/sooka/web/controller/system/SysDeptController.java
파일 보기 

@@ -172,6 +172,21 @@ public class SysDeptController extends BaseController
 
     }
 
 
     /**
 
+     * 选择菜单部门树
 
+     *
 
+     * @param deptId 部门ID
 
+     * @param excludeId 排除ID
 
+     */
 
+    @GetMapping(value = { "/selectMenuDeptTree/{deptId}", "/selectMenuDeptTree/{deptId}/{excludeId}" })
 
+    public String selectMenuDeptTree(@PathVariable("deptId") Long deptId,
 
+            @PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap)
 
+    {
 
+        mmap.put("dept", deptService.selectDeptById(deptId));
 
+        mmap.put("excludeId", excludeId);
 
+        return prefix + "/deptTree";
 
+    }
 
+
 
+    /**
 
      * 接口申请选择部门树
 
      *
 
      * @param deptId 部门ID

+ 52 - 0
leiSP-admin/src/main/resources/templates/system/dept/deptTree.html
파일 보기 

@@ -0,0 +1,52 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
+<head>
 
+	<th:block th:include="include :: header('部门树选择')" />
 
+	<th:block th:include="include :: ztree-css" />
 
+</head>
 
+<style>
 
+	body{height:auto;font-family: "Microsoft YaHei";}
 
+	button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
 
+</style>
 
+<body class="hold-transition box box-main">
 
+	<input id="treeId"   name="treeId"    type="hidden" th:value="${deptId}"/>
 
+	<input id="treeName" name="treeName"  type="hidden" th:value="${deptName}"/>
 
+	<div class="wrapper"><div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
 
+		<label id="btnShow" title="显示搜索" style="display:none;">︾</label>
 
+		<label id="btnHide" title="隐藏搜索">︽</label>
 
+	</div>
 
+	<div class="treeSearchInput" id="search">
 
+		<label for="keyword">关键字：</label><input type="text" class="empty" id="keyword" maxlength="50">
 
+		<button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
 
+	</div>
 
+	<div class="treeExpandCollapse">
 
+		<a href="#" onclick="$.tree.expand()">展开</a> /
 
+		<a href="#" onclick="$.tree.collapse()">折叠</a>
 
+	</div>
 
+	<div id="tree" class="ztree treeselect"></div>
 
+	</div>
 
+	<th:block th:include="include :: footer" />
 
+	<th:block th:include="include :: ztree-js" />
 
+	<script th:inline="javascript">
 
+	    var prefix = ctx + "system/dept"
 
+	    var deptId = [[${deptId}]];
 
+	    var excludeId = [[${excludeId}]];
 
+		$(function() {
 
+			var url = $.common.isEmpty(excludeId) ? prefix + "/treeData": prefix + "/treeData/" + excludeId;
 
+			var options = {
 
+		        url: url,
 
+		        expandLevel: 2,
 
+		        onClick : zOnClick
 
+		    };
 
+			$.tree.init(options);
 
+		});
 
+		
+		function zOnClick(event, treeId, treeNode) {
 
+		    var treeId = treeNode.id;
 
+		    var treeName = treeNode.name;
 
+		    $("#treeId").val(treeId);
 
+		    $("#treeName").val(treeName);
 
+		}
 
+	</script>
 
+</body>
 
+</html>

+ 33 - 0
leiSP-admin/src/main/resources/templates/system/menu/edit.html
파일 보기 

@@ -8,6 +8,7 @@
 
 		<form class="form-horizontal m" id="form-menu-edit" th:object="${menu}">
 
 			<input name="menuId"   type="hidden" th:field="*{menuId}"   />
 
 			<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
 
+			<input name="deptId"  type="hidden"  th:field="*{deptId}" id="deptTreeId"/>
 
 			<div class="form-group">
 
 				<label class="col-sm-3 control-label">上级菜单：</label>
 
 				<div class="col-sm-8">
 
@@ -79,6 +80,15 @@
 
 					</div>
 
 				</div>
 
 			</div>
 
+			<div class="form-group">
 
+				<label class="col-sm-3 control-label">归属部门：</label>
 
+				<div class="col-sm-8">
 
+					<div class="input-group">
 
+						<input class="form-control" type="text" name="deptName" onclick="selectDeptTree()" id="deptTreeName" th:field="*{deptName}">
 
+						<span class="input-group-addon"><i class="fa fa-search"></i></span>
 
+					</div>
 
+				</div>
 
+			</div>
 
 		</form>
 
 	</div>
 
 	<th:block th:include="include :: footer" />
 
@@ -135,6 +145,29 @@
 
 	        }
 
 	    }
 
 
+        /*菜单管理-修改-选择部门树*/
 
+        function selectDeptTree() {
 
+            var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
 
+            var url = ctx + "system/dept/selectMenuDeptTree/" + deptId;
 
+            var options = {
 
+                title: '选择部门',
 
+                width: "380",
 
+                url: url,
 
+                callBack: doDeptTreeSubmit
 
+            };
 
+            $.modal.openOptions(options);
 
+        }
 
+
 
+        function doDeptTreeSubmit(index, layero){
 
+            var tree = layero.find("iframe")[0].contentWindow.$._tree;
 
+            if ($.tree.notAllowParents(tree)) {
 
+                var body = layer.getChildFrame('body', index);
 
+                $("#deptTreeId").val(body.find('#treeId').val());
 
+                $("#deptTreeName").val(body.find('#treeName').val());
 
+                layer.close(index);
 
+            }
 
+        }
 
+
 
         $(function() {
 
             $("input[name='icon']").focus(function() {
 
                 $(".icon-drop").show();

+ 11 - 0
leiSP-system/src/main/java/com/sooka/system/domain/SysMenu.java
파일 보기 

@@ -3,6 +3,9 @@ package com.sooka.system.domain;
 
 import java.util.List;
 
 import java.util.ArrayList;
 
 import javax.validation.constraints.*;
 
+
 
+import lombok.Getter;
 
+import lombok.Setter;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.sooka.common.core.domain.BaseEntity;
 
@@ -12,6 +15,8 @@ import com.sooka.common.core.domain.BaseEntity;
 
  * 
  * @author lei_wang
 
  */
 
+@Getter
 
+@Setter
 
 public class SysMenu extends BaseEntity
 
 {
 
     private static final long serialVersionUID = 1L;
 
@@ -34,6 +39,12 @@ public class SysMenu extends BaseEntity
 
     /** 菜单URL */
 
     private String url;
 
 
+    /** 部门ID */
 
+    private Long deptId;
 
+
 
+    /** 部门名称 */
 
+    private String deptName;
 
+
 
     /** 打开方式：menuItem页签 menuBlank新窗口 */
 
     private String target;

+ 15 - 7
leiSP-system/src/main/resources/mapper/system/SysMenuMapper.xml
파일 보기 

@@ -11,6 +11,8 @@
 
 		<result property="parentId"       column="parent_id"      />
 
 		<result property="orderNum"       column="order_num"      />
 
 		<result property="url"            column="url"            />
 
+		<result property="deptId"   	  column="dept_id"        />
 
+		<result property="deptName"       column="dept_name"      />
 
 		<result property="target"         column="target"         />
 
 		<result property="menuType"       column="menu_type"      />
 
 		<result property="visible"        column="visible"        />
 
@@ -24,12 +26,12 @@
 
 	</resultMap>
 
 
 	<sql id="selectMenuVo">
 
-        select menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, ifnull(perms,'') as perms, icon, create_by, create_time 
+        select menu_id, menu_name, parent_id, order_num, url, dept_id, dept_name, target, menu_type, visible, ifnull(perms,'') as perms, icon, create_by, create_time
 
 		from sys_menu
 
     </sql>
 
 
 	<select id="selectMenusByUserId" parameterType="Long" resultMap="SysMenuResult">
 
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.dept_id, m.dept_name, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
 		from sys_menu m
 
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 
@@ -39,7 +41,7 @@
 
 	</select>
 
 
 	<select id="selectMenuNormalAll" resultMap="SysMenuResult">
 
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.dept_id, m.dept_name, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
 		from sys_menu m
 
 		where m.menu_type in ('M', 'C') and m.visible = 0
 
 		order by m.parent_id, m.order_num
 
@@ -51,7 +53,7 @@
 
 	</select>
 
 
 	<select id="selectMenuAllByUserId" parameterType="Long" resultMap="SysMenuResult">
 
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.dept_id, m.dept_name, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
 		from sys_menu m
 
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 
@@ -61,7 +63,7 @@
 
 	</select>
 
 
 	<select id="selectMenuListByParentId" parameterType="Long" resultMap="SysMenuResult">
 
-		select m.menu_id, m.parent_id, m.menu_name, (select menu_name from sys_menu where menu_id = m.parent_id) url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
+		select m.menu_id, m.parent_id, m.menu_name, (select menu_name from sys_menu where menu_id = m.parent_id) url, m.dept_id, m.dept_name, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
 		from sys_menu m
 
 		where m.menu_type in ('M', 'C') and m.visible = 0 and m.parent_id = #{parentId}
 
 		order by m.order_num
 
@@ -98,7 +100,7 @@
 
 	</select>
 
 
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.dept_id, m.dept_name, m.visible, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
 
 		from sys_menu m
 
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
 
 		left join sys_user_role ur on rm.role_id = ur.role_id
 
@@ -118,7 +120,7 @@
 
 	</delete>
 
 
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 
-		SELECT t.menu_id, t.parent_id, t.menu_name, t.order_num, t.url, t.target, t.menu_type, t.visible, t.perms, t.icon, t.remark,
 
+		SELECT t.menu_id, t.parent_id, t.menu_name, t.order_num, t.url, t.dept_id, t.dept_name, t.target, t.menu_type, t.visible, t.perms, t.icon, t.remark,
 
 			(SELECT menu_name FROM sys_menu WHERE menu_id = t.parent_id) parent_name
 
 		FROM sys_menu t
 
 		where t.menu_id = #{menuId}
 
@@ -140,6 +142,8 @@
 
 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
 
 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
 
 			<if test="url != null">url = #{url},</if>
 
+			<if test="deptId != null">dept_id = #{deptId},</if>
 
+			<if test="deptName != null">dept_name = #{deptName},</if>
 
 			<if test="target != null and target != ''">target = #{target},</if>
 
 			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
 
 			<if test="visible != null">visible = #{visible},</if>
 
@@ -159,6 +163,8 @@
 
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 
 		<if test="orderNum != null and orderNum != ''">order_num,</if>
 
 		<if test="url != null and url != ''">url,</if>
 
+		<if test="deptId != null and deptId != ''">dept_id,</if>
 
+		<if test="deptName != null and deptName != ''">dept_name,</if>
 
 		<if test="target != null and target != ''">target,</if>
 
 		<if test="menuType != null and menuType != ''">menu_type,</if>
 
 		<if test="visible != null">visible,</if>
 
@@ -173,6 +179,8 @@
 
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
 
 		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
 
 		<if test="url != null and url != ''">#{url},</if>
 
+		<if test="deptId != null and deptId != ''">#{deptId},</if>
 
+		<if test="deptName != null and deptName != ''">#{deptName},</if>
 
 		<if test="target != null and target != ''">#{target},</if>
 
 		<if test="menuType != null and menuType != ''">#{menuType},</if>
 
 		<if test="visible != null">#{visible},</if>

+ 58 - 0
mybusiness/src/main/java/com/business/controller/VisualizationController.java
파일 보기 

@@ -3,6 +3,7 @@ package com.business.controller;
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONObject;
 
 import com.business.domain.ImputationData;
 
+import com.business.mapper.ImputationDataMapper;
 
 import com.business.service.ImputationDataService;
 
 import com.sooka.apply.service.IIntRecordService;
 
 import com.sooka.common.core.controller.BaseController;
 
@@ -22,6 +23,7 @@ import org.springframework.ui.ModelMap;
 
 import org.springframework.web.bind.annotation.*;
 
 import sun.plugin2.util.SystemUtil;
 
 
+import javax.annotation.Resource;
 
 import java.math.BigDecimal;
 
 import java.util.List;
 
 
@@ -41,6 +43,9 @@ public class VisualizationController extends BaseController {
 
     @Autowired
 
     private ImputationDataService imputationDataService;
 
 
+    @Resource
 
+    private ImputationDataMapper imputationDataMapper;
 
+
 
     @Autowired
 
     private ISysDeptService sysDeptService;
 
 
@@ -262,6 +267,59 @@ public class VisualizationController extends BaseController {
 
     @ResponseBody
 
     public String[] getImputationDataList(String year){
 
         String[] arr = new String[12];
 
+        Long[] calendar = new Long[12];
 
+        calendar[0] = 0L;
 
+        calendar[1] = 0L;
 
+        calendar[2] = 0L;
 
+        calendar[3] = 0L;
 
+        calendar[4] = 0L;
 
+        calendar[5] = 0L;
 
+        calendar[6] = 0L;
 
+        calendar[7] = 0L;
 
+        calendar[8] = 0L;
 
+        calendar[9] = 0L;
 
+        calendar[10] = 0L;
 
+        calendar[11] = 0L;
 
+        ImputationData param = new ImputationData();
 
+        param.setYear(year);
 
+        List<ImputationData> imputationDataList = imputationDataMapper.selectImputationInterface(param);
 
+        for (int i = 0; i < imputationDataList.size(); i++) {
 
+            ImputationData imputationData = imputationDataList.get(i);
 
+            calendar[0] += Long.valueOf(imputationData.getJan());
 
+            calendar[1] += Long.valueOf(imputationData.getFeb());
 
+            calendar[2] += Long.valueOf(imputationData.getMar());
 
+            calendar[3] += Long.valueOf(imputationData.getApr());
 
+            calendar[4] += Long.valueOf(imputationData.getMay());
 
+            calendar[5] += Long.valueOf(imputationData.getJun());
 
+            calendar[6] += Long.valueOf(imputationData.getJul());
 
+            calendar[7] += Long.valueOf(imputationData.getAug());
 
+            calendar[8] += Long.valueOf(imputationData.getSep());
 
+            calendar[9] += Long.valueOf(imputationData.getOct());
 
+            calendar[10] += Long.valueOf(imputationData.getNov());
 
+            calendar[11] += Long.valueOf(imputationData.getDecb());
 
+        }
 
+        arr[0] = calendar[0].toString();
 
+        arr[1] = calendar[1].toString();
 
+        arr[2] = calendar[2].toString();
 
+        arr[3] = calendar[3].toString();
 
+        arr[4] = calendar[4].toString();
 
+        arr[5] = calendar[5].toString();
 
+        arr[6] = calendar[6].toString();
 
+        arr[7] = calendar[7].toString();
 
+        arr[8] = calendar[8].toString();
 
+        arr[9] = calendar[9].toString();
 
+        arr[10] = calendar[10].toString();
 
+        arr[11] = calendar[11].toString();
 
+        return arr;
 
+    }
 
+
 
+    /**
 
+     * 查询月度归集数据分析
 
+     * */
 
+    @PostMapping("getImputationDataList_old")
 
+    @ResponseBody
 
+    public String[] getImputationDataList_(String year){
 
+        String[] arr = new String[12];
 
         ImputationData id = new ImputationData();
 
         id.setYear(year);
 
         ImputationData data = imputationDataService.selectImputationData(id);

+ 6 - 0
mybusiness/src/main/java/com/business/domain/ImputationData.java
파일 보기 

@@ -17,6 +17,12 @@ public class ImputationData extends BaseEntity
 
     /** 年份 */
 
     private String year;
 
 
+    /** 表名 */
 
+    private String tableName;
 
+
 
+    /** 接口名称 */
 
+    private String interfaceName;
 
+
 
     /** 1月 */
 
     private String jan;

+ 19 - 0
mybusiness/src/main/java/com/business/mapper/ImputationDataMapper.java
파일 보기 

@@ -8,6 +8,7 @@ import java.util.List;
 
  * @author Administrator
 
  */
 
 public interface ImputationDataMapper {
 
+
 
     /**
 
      * 查询日志归集数据
 
      *
 
@@ -15,6 +16,16 @@ public interface ImputationDataMapper {
 
      * @return 结果
 
      */
 
     public ImputationData selectImputationData(ImputationData imputationData);
 
+
 
+    /**
 
+     * 接口日志归集数据
 
+     *
 
+     * @param imputationData 接口归集数据
 
+     * @return 结果
 
+     */
 
+
 
+    public List<ImputationData> selectImputationInterface(ImputationData imputationData);
 
+
 
     /**
 
      * 新增日志归集数据
 
      *
 
@@ -24,6 +35,14 @@ public interface ImputationDataMapper {
 
     public int insertImputationData(ImputationData imputationData);
 
 
     /**
 
+     * 新增接口归集数据
 
+     *
 
+     * @param imputationData 接口归集数据
 
+     * @return 结果
 
+     */
 
+    public int insertImputationInterface(ImputationData imputationData);
 
+
 
+    /**
 
      * 修改日志归集数据
 
      *
 
      * @param imputationData 日志归集数据

+ 4 - 4
mybusiness/src/main/java/com/sooka/applyData/controller/DataExamineController.java
파일 보기 

@@ -40,13 +40,13 @@ public class DataExamineController extends BaseController {
 
     }
 
 
     /**
 
-     * 查询我的审批
 
+     * 查询我的审核
 
      */
 
     @PostMapping("/list")
 
     @ResponseBody
 
     public TableDataInfo list(DataRecord DataRecord)
 
     {
 
-        //只查提供部门待审批的数据
 
+        //只查提供部门待审核的数据
 
         DataRecord.setStatus("4");
 
         DataRecord.setProvideDeptId(ShiroUtils.getSysUser().getDeptId().toString());
 
         startPage();
 
@@ -55,7 +55,7 @@ public class DataExamineController extends BaseController {
 
     }
 
 
     /**
 
-     * 导出我的审批
 
+     * 导出我的审核
 
      */
 
     @PostMapping("/export")
 
     @ResponseBody
 
@@ -67,7 +67,7 @@ public class DataExamineController extends BaseController {
 
     }
 
 
     /**
 
-     * 审批页面
 
+     * 审核页面
 
      */
 
     @GetMapping("/examine/{id}")
 
     public String examine(@PathVariable("id") String id, ModelMap mmap)

+ 8 - 0
mybusiness/src/main/java/com/sooka/applyData/controller/DataRecordController.java
파일 보기 

@@ -13,13 +13,16 @@ import com.sooka.common.core.page.TableDataInfo;
 
 import com.sooka.common.enums.BusinessType;
 
 import com.sooka.common.utils.poi.ExcelUtil;
 
 import com.sooka.framework.util.ShiroUtils;
 
+import com.sooka.system.domain.SysMenu;
 
 import com.sooka.system.domain.SysUser;
 
+import com.sooka.system.mapper.SysMenuMapper;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Controller;
 
 import org.springframework.ui.ModelMap;
 
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.annotation.Resource;
 
 import java.util.ArrayList;
 
 import java.util.List;
 
 
@@ -38,6 +41,9 @@ public class DataRecordController extends BaseController
 
     @Autowired
 
     private IDataRecordService DataRecordService;
 
 
+    @Resource
 
+    private SysMenuMapper sysMenuMapper;
 
+
 
     @RequiresPermissions("apply:record:view")
 
     @GetMapping()
 
     public String record()
 
@@ -80,6 +86,8 @@ public class DataRecordController extends BaseController
 
     @ResponseBody
 
     public AjaxResult addSave(DataRecord DataRecord)
 
     {
 
+        SysMenu sysDept = sysMenuMapper.selectMenuById(Long.valueOf(DataRecord.getProvideDeptId()));
 
+        DataRecord.setProvideDeptId(sysDept.getDeptId().toString());
 
         DataRecord.setDataDetailedList(structureSubData(DataRecord.getSubData()));
 
         return toAjax(DataRecordService.insertDataRecord(DataRecord));
 
     }

+ 29 - 46
mybusiness/src/main/java/com/sooka/system/service/impl/TUInterfaceinfoServiceImpl.java
파일 보기 

@@ -231,69 +231,52 @@ public class TUInterfaceinfoServiceImpl implements ITUInterfaceinfoService
 
      */
 
     @Override
 
     public void imputationData(){
 
-        Long[] calendar = new Long[13];
 
-        calendar[1] = 0L;
 
-        calendar[2] = 0L;
 
-        calendar[3] = 0L;
 
-        calendar[4] = 0L;
 
-        calendar[5] = 0L;
 
-        calendar[6] = 0L;
 
-        calendar[7] = 0L;
 
-        calendar[8] = 0L;
 
-        calendar[9] = 0L;
 
-        calendar[10] = 0L;
 
-        calendar[11] = 0L;
 
-        calendar[12] = 0L;
 
+        String year = "2022";
 
         TUInterfaceinfo param = new TUInterfaceinfo();
 
 //        param.setNeedRefresh("1");
 
+        //(164-57) t_guiji_gas_zenner_gas_purchase_center_infor - 归集-市燃气（真兰收费系统）-中心计费购气信息 - 237962 ms
 
+        //(164-70) t_guiji_gas_zenner_meter_reading_infor - 归集-市燃气（真兰收费系统）-抄表信息 - 352968 ms
 
         List<TUInterfaceinfo> tuInterfaceinfoList = tUInterfaceinfoMapper.selectTUInterfaceinfoList(param);
 
         for (int i = 0; i < tuInterfaceinfoList.size(); i++) {
 
             TUInterfaceinfo tuInterfaceinfo = tuInterfaceinfoList.get(i);
 
             String tableName = tuInterfaceinfo.getTableName();
 
-            if (tableName == null || tableName.equals("")) {
 
+            if (tableName == null || tableName.equals("") || tableName.equals("t_u_interfaceinfo_emptytable")) {
 
                 System.out.println("(" + tuInterfaceinfoList.size() + "-" + (i + 1) + ") " + tuInterfaceinfo.getTableName() + " - " + tuInterfaceinfo.getInterfaceName() + " - " + 0 + " ms");
 
                 continue;
 
             }
 
+            ImputationData imputationDataParam = new ImputationData();
 
+            imputationDataParam.setYear(year);
 
+            imputationDataParam.setTableName(tableName);
 
+            boolean isExist = !(imputationDataMapper.selectImputationInterface(imputationDataParam).size() == 0);
 
+            if(isExist){
 
+                continue;
 
+            }
 
             Map map = new HashMap();
 
-            map.put("year", "2020");
 
+            map.put("year", year);
 
             map.put("tableName", tableName);
 
             System.out.println(tuInterfaceinfo.getTableName() + " - " + tuInterfaceinfo.getInterfaceName() + " - " + "updating database... id = " + tuInterfaceinfo.getId());
 
             Date dateBegin = new Date();
 
             ImputationData imputationData = tUInterfaceinfoMapper.imputationData(map);
 
             Long interval = new Date().getTime() - dateBegin.getTime();//接口查询总数所用时间
 
-            calendar[1] += Long.valueOf(imputationData.getJan());
 
-            calendar[2] += Long.valueOf(imputationData.getFeb());
 
-            calendar[3] += Long.valueOf(imputationData.getMar());
 
-            calendar[4] += Long.valueOf(imputationData.getApr());
 
-            calendar[5] += Long.valueOf(imputationData.getMay());
 
-            calendar[6] += Long.valueOf(imputationData.getJun());
 
-            calendar[7] += Long.valueOf(imputationData.getJul());
 
-            calendar[8] += Long.valueOf(imputationData.getAug());
 
-            calendar[9] += Long.valueOf(imputationData.getSep());
 
-            calendar[10] += Long.valueOf(imputationData.getOct());
 
-            calendar[11] += Long.valueOf(imputationData.getNov());
 
-            calendar[12] += Long.valueOf(imputationData.getDecb());
 
+            ImputationData imputationDataInsert = new ImputationData();
 
+            imputationDataInsert.setYear(year);
 
+            imputationDataInsert.setTableName(tableName);
 
+            imputationDataInsert.setInterfaceName(tuInterfaceinfo.getInterfaceName());
 
+            imputationDataInsert.setJan(imputationData.getJan());
 
+            imputationDataInsert.setFeb(imputationData.getFeb());
 
+            imputationDataInsert.setMar(imputationData.getMar());
 
+            imputationDataInsert.setApr(imputationData.getApr());
 
+            imputationDataInsert.setMay(imputationData.getMay());
 
+            imputationDataInsert.setJun(imputationData.getJun());
 
+            imputationDataInsert.setJul(imputationData.getJul());
 
+            imputationDataInsert.setAug(imputationData.getAug());
 
+            imputationDataInsert.setSep(imputationData.getSep());
 
+            imputationDataInsert.setOct(imputationData.getOct());
 
+            imputationDataInsert.setNov(imputationData.getNov());
 
+            imputationDataInsert.setDecb(imputationData.getDecb());
 
+            imputationDataMapper.insertImputationInterface(imputationDataInsert);
 
             System.out.println("(" + tuInterfaceinfoList.size() + "-" + (i + 1) + ") " + tuInterfaceinfo.getTableName() + " - " + tuInterfaceinfo.getInterfaceName() + " - " + interval + " ms");
 
-            tuInterfaceinfo.setRefreshTime(new Date());
 
-//            tuInterfaceinfo.setNeedRefresh("2");
 
-//            tUInterfaceinfoMapper.updateInterfaceCallsuccnum(tuInterfaceinfo);
 
-            //update t_u_interfaceinfo set callsuccnum = #{callsuccnum} where id = #{id}
 
         }
 
-        ImputationData imputationData = new ImputationData();
 
-        imputationData.setYear("2020");
 
-        imputationData.setJan(calendar[1].toString());
 
-        imputationData.setFeb(calendar[2].toString());
 
-        imputationData.setMar(calendar[3].toString());
 
-        imputationData.setApr(calendar[4].toString());
 
-        imputationData.setMay(calendar[5].toString());
 
-        imputationData.setJun(calendar[6].toString());
 
-        imputationData.setJul(calendar[7].toString());
 
-        imputationData.setAug(calendar[8].toString());
 
-        imputationData.setSep(calendar[9].toString());
 
-        imputationData.setOct(calendar[10].toString());
 
-        imputationData.setNov(calendar[11].toString());
 
-        imputationData.setDecb(calendar[12].toString());
 
-        imputationDataMapper.updateImputationData(imputationData);
 
     }
 
 
     /**

+ 47 - 0
mybusiness/src/main/resources/mapper/imputationData/ImputationDataMapper.xml
파일 보기 

@@ -31,6 +31,53 @@
 
         </where>
 
     </select>
 
 
+    <select id="selectImputationInterface" parameterType="ImputationData" resultType="ImputationData">
 
+        select year, table_name tableName, interface_name interfaceName, jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, decb from t_u_imputation_interface
 
+        <where>
 
+            <if test="year != null  and year != ''"> and year = #{year}</if>
 
+            <if test="tableName != null  and tableName != ''"> and table_name = #{tableName}</if>
 
+            <if test="interfaceName != null  and interfaceName != ''"> and interface_name = #{interfaceName}</if>
 
+        </where>
 
+    </select>
 
+
 
+    <insert id="insertImputationInterface" parameterType="ImputationData">
 
+        insert into t_u_imputation_interface
 
+            <trim prefix="(" suffix=")" suffixOverrides=",">
 
+                <if test="year != null">year,</if>
 
+                <if test="tableName != null">table_name,</if>
 
+                <if test="interfaceName != null">interface_name,</if>
 
+                <if test="jan != null">jan,</if>
 
+                <if test="feb != null">feb,</if>
 
+                <if test="mar != null">mar,</if>
 
+                <if test="apr != null">apr,</if>
 
+                <if test="may != null">may,</if>
 
+                <if test="jun != null">jun,</if>
 
+                <if test="jul != null">jul,</if>
 
+                <if test="aug != null">aug,</if>
 
+                <if test="sep != null">sep,</if>
 
+                <if test="oct != null">oct,</if>
 
+                <if test="nov != null">nov,</if>
 
+                <if test="decb != null">decb,</if>
 
+            </trim>
 
+            <trim prefix="values (" suffix=")" suffixOverrides=",">
 
+                <if test="year != null">#{year},</if>
 
+                <if test="tableName != null">#{tableName},</if>
 
+                <if test="interfaceName != null">#{interfaceName},</if>
 
+                <if test="jan != null">#{jan},</if>
 
+                <if test="feb != null">#{feb},</if>
 
+                <if test="mar != null">#{mar},</if>
 
+                <if test="apr != null">#{apr},</if>
 
+                <if test="may != null">#{may},</if>
 
+                <if test="jun != null">#{jun},</if>
 
+                <if test="jul != null">#{jul},</if>
 
+                <if test="aug != null">#{aug},</if>
 
+                <if test="sep != null">#{sep},</if>
 
+                <if test="oct != null">#{oct},</if>
 
+                <if test="nov != null">#{nov},</if>
 
+                <if test="decb != null">#{decb},</if>
 
+            </trim>
 
+    </insert>
 
+
 
     <insert id="insertImputationData" parameterType="ImputationData">
 
         insert into t_u_imputation_data
 
             <trim prefix="(" suffix=")" suffixOverrides=",">

+ 1 - 1
mybusiness/src/main/resources/templates/applyData/approval/approval.html
파일 보기 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head>
 
-    <th:block th:include="include :: header('申请记录列表')" />
 
+    <th:block th:include="include :: header('审批记录列表')" />
 
 </head>
 
 <body class="gray-bg">
 
 <div class="container-div">

+ 1 - 1
mybusiness/src/main/resources/templates/applyData/examine/examine.html
파일 보기 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head>
 
-    <th:block th:include="include :: header('申请记录列表')" />
 
+    <th:block th:include="include :: header('审核记录列表')" />
 
 </head>
 
 <body class="gray-bg">
 
 <div class="container-div">