修改统计分析接口

liutongyi-admin/src/main/java/com/citygis/web/controller/GetTokenController.java

@@ -8,6 +8,7 @@ import com.citygis.web.domain.TabUser;
 import com.citygis.web.service.ITabUserService;
 import com.citygis.web.utils.AesUtil;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
@@ -45,8 +46,9 @@ public class GetTokenController {
     @Resource
     ITabUserService tabUserService;
 
-    @PostMapping("/user")
     @Log(title = "获取catalogToken", businessType = BusinessType.OTHER)
+    @ApiOperation("获取catalogToken")
+    @PostMapping("/user")
     public Mono<ResponseEntity<String>> forwardPostRequest() {
         LoginBody loginBody = new LoginBody();
         Long userId = getUserId();

liutongyi-admin/src/main/java/com/citygis/web/controller/TabSystemMsgController.java

@@ -31,6 +31,14 @@ public class TabSystemMsgController extends BaseController {
     @Resource
     ITabSystemMsgService tabSystemMsgService;
 
+    @Log(title = "统计分析管理-统计分析", businessType = BusinessType.SELECT)
+    @ApiOperation("统计分析")
+    @GetMapping("/getStatistics")
+    public TableDataInfo getStatistics(TabSystemMsg tabSystemMsg) {
+        startPage();
+        return getDataTable(tabSystemMsgService.getStatistics(tabSystemMsg));
+    }
+
     @Log(title = "统计分析管理-统一接入同步结果", businessType = BusinessType.SELECT)
     @ApiOperation("统一接入同步结果")
     @GetMapping("/getTabSystemMsgList")

liutongyi-admin/src/main/java/com/citygis/web/controller/TabUserController.java

@@ -29,7 +29,7 @@ public class TabUserController {
     @Resource
     ITabUserService tabUserService;
 
-    @ApiOperation("添加登录用户")
+    @ApiOperation("记录登录用户")
     @PostMapping("insertTabUser")
     public AjaxResult insertTabUser(@RequestBody TabUser tabUser){
         return tabUserService.insertTabUser(tabUser);

liutongyi-admin/src/main/java/com/citygis/web/domain/Exchange.java

@@ -52,6 +52,12 @@ public class Exchange implements Serializable {
     @ApiModelProperty(value = "序号")
     private String inx;
 
+    @ApiModelProperty(value = "jkcloud数量")
+    private String jkNum;
+
+    @ApiModelProperty(value = "差异")
+    private String difference;
+
     private String dateTime;
 
 }

liutongyi-admin/src/main/java/com/citygis/web/domain/TabSystemMsg.java

@@ -74,10 +74,15 @@ public class TabSystemMsg implements Serializable {
     private Integer isDel;
 
     @ApiModelProperty(value = "开始时间")
+    @TableField(exist = false)
     private String startTime;
 
     @ApiModelProperty(value = "结束时间")
+    @TableField(exist = false)
     private String endTime;
 
+    @TableField(exist = false)
+    private Integer state;
+
 
 }

liutongyi-admin/src/main/java/com/citygis/web/mapper/TabSystemMsgMapper.java

@@ -17,6 +17,8 @@ import java.util.List;
 @Mapper
 public interface TabSystemMsgMapper extends BaseMapper<TabSystemMsg> {
 
+    List<TabSystemMsg> getStatistics(TabSystemMsg tabSystemMsg);
+
     List<TabSystemMsg> getTabSystemMsgList(TabSystemMsg tabSystemMsg);
 
     List<TabAccessTableMsg> getTabAccessTableMsgList();

liutongyi-admin/src/main/java/com/citygis/web/service/ITabSystemMsgService.java

@@ -15,6 +15,8 @@ import java.util.List;
  */
 public interface ITabSystemMsgService extends IService<TabSystemMsg> {
 
+    List<TabSystemMsg> getStatistics(TabSystemMsg tabSystemMsg);
+
     List<TabSystemMsg> getTabSystemMsgList(TabSystemMsg tabSystemMsg);
 
     List<Exchange> getExchangeCount(String dateTime);

liutongyi-admin/src/main/java/com/citygis/web/service/impl/TabSystemMsgServiceImpl.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author citygis
@@ -26,10 +26,25 @@ public class TabSystemMsgServiceImpl extends ServiceImpl<TabSystemMsgMapper, Tab
     @Resource
     TabSystemMsgMapper tabSystemMsgMapper;
 
+    @Override
+    public List<TabSystemMsg> getStatistics(TabSystemMsg tabSystemMsg) {
+        List<TabSystemMsg> list = tabSystemMsgMapper.getTabSystemMsgList(tabSystemMsg);
+        List<TabAccessTableMsg> tabAccessTableMsg = tabSystemMsgMapper.getTabAccessTableMsgList();
+        list.forEach(tabSystemMsg1 -> {
+            tabAccessTableMsg.forEach(tabAccessTableMsg1 -> {
+                if (tabAccessTableMsg1.getTableName().equals(tabSystemMsg1.getTableName())) {
+                    tabSystemMsg1.setCount(tabAccessTableMsg1.getCount());
+                }
+            });
+        });
+        return list;
+    }
+
     @Override
     public List<TabSystemMsg> getTabSystemMsgList(TabSystemMsg tabSystemMsg) {
+
+        List<TabSystemMsg> list = tabSystemMsgMapper.getTabSystemMsgList(tabSystemMsg);
         List<TabAccessTableMsg> tabAccessTableMsg = tabSystemMsgMapper.getTabAccessTableMsgList();
-        List<TabSystemMsg> list = this.list();
         list.forEach(tabSystemMsg1 -> {
             tabAccessTableMsg.forEach(tabAccessTableMsg1 -> {
                 if (tabAccessTableMsg1.getTableName().equals(tabSystemMsg1.getTableName())) {

liutongyi-admin/src/main/resources/mapper/TabSystemMsgMapper.xml

@@ -2,9 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.citygis.web.mapper.TabSystemMsgMapper">
 
+    <select id="getStatistics" resultType="com.citygis.web.domain.TabSystemMsg"
+            parameterType="com.citygis.web.domain.TabSystemMsg">
+        SELECT id, system_name, table_name, table_english_name, access_manner, update_type, status state, ps, count,
+        data_essential_id, is_del
+        FROM test.dbo.tab_system_msg
+        where is_del = 0
+        <if test="systemName != null">
+            and system_name like concat('%',#{systemName},'%')
+        </if>
+        <if test="tableEnglishName != null">
+            and table_english_name like concat('%',#{tableEnglishName},'%')
+        </if>
+        <if test="updateType != null">
+            and update_type = #{updateType}
+        </if>
+
+    </select>
+
     <select id="getTabSystemMsgList" resultType="com.citygis.web.domain.TabSystemMsg"
             parameterType="com.citygis.web.domain.TabSystemMsg">
-        SELECT id, system_name, table_name, table_english_name, access_manner, update_type, status, ps, count,
+        SELECT id, system_name, table_name, table_english_name, access_manner, update_type, status state, ps, count,
         data_essential_id, is_del
         FROM test.dbo.tab_system_msg
         where is_del = 0
@@ -15,7 +33,7 @@
             and table_english_name like concat('%',#{tableEnglishName},'%')
         </if>
         <if test="updateType != null">
-            update_type = #{updateType}
+            and update_type = #{updateType}
         </if>
 
     </select>
@@ -36,8 +54,8 @@
     <select id="getExchangeCount" resultType="com.citygis.web.domain.Exchange">
 
         SELECT allCount, selectConutLog, insertCountLog, insertCount, updateCountLog, updateCount, deleteCountLog,
-        deleteCount, insertError, updateError, deleteError, operationTime, tableName, inx
-        FROM test.dbo.view_DailyReport
+        deleteCount, insertError, updateError, deleteError, operationTime time, tableName, inx,jkNum,difference
+        FROM test.dbo.view_DailyReport where operationTime = #{dateTime}
 
         <!--        SELECT-->
         <!--        插入_更新_删除总量 allCount,-->
@@ -387,7 +405,7 @@
         count,
         data_essential_id)
         VALUES(#{id},
-        #{systemName]},
+        #{systemName},
         #{tableName},
         #{tableEnglishName},
         #{accessManner},