微调

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/KingdeelogController.java

 package org.jeecg.modules.iost.ims.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.iost.ims.entity.Kingdeelog;
 import org.jeecg.modules.iost.ims.service.IKingdeelogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +48,7 @@ public class KingdeelogController extends JeecgController<Kingdeelog, IKingdeelo
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req, String dateString, String nameString,
                                    @RequestParam(name = "successStatus") String status) {
-        QueryWrapper<Kingdeelog> queryWrapper = QueryGenerator.initQueryWrapper(kingdeelog, req.getParameterMap());
+        /*QueryWrapper<Kingdeelog> queryWrapper = QueryGenerator.initQueryWrapper(kingdeelog, req.getParameterMap());
         Page<Kingdeelog> page = new Page<Kingdeelog>(pageNo, pageSize);
         if (StringUtils.isNotBlank(dateString)) {
             String[] split = dateString.split(",");
@@ -67,7 +63,9 @@ public class KingdeelogController extends JeecgController<Kingdeelog, IKingdeelo
             queryWrapper.eq("synchronization", "false");
         }
         queryWrapper.orderByDesc("createtime");
-        IPage<Kingdeelog> pageList = kingdeelogService.page(page, queryWrapper);
+        IPage<Kingdeelog> pageList = kingdeelogService.page(page, queryWrapper);*/
+
+        IPage<Kingdeelog> pageList = kingdeelogService.kingdeeLogList(pageNo, pageSize, dateString, nameString, status);
         return Result.OK(pageList);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/mapper/KingdeelogMapper.java

 package org.jeecg.modules.iost.ims.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.iost.ims.entity.Kingdeelog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * @Description: ims金蝶日志
@@ -16,4 +17,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface KingdeelogMapper extends BaseMapper<Kingdeelog> {
 
+    /**
+     * 金蝶日志列表
+     */
+    List<Kingdeelog> kingdeeLogList(@Param("page") Page<Kingdeelog> page, @Param("dateForm") String dateForm, @Param("dateTo") String dateTo, @Param("nameString") String nameString, @Param("synchronization") String synchronization);
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/mapper/xml/KingdeelogMapper.xml

@@ -2,4 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.iost.ims.mapper.KingdeelogMapper">
 
+
+
+    <select id="kingdeeLogList" parameterType="java.lang.Object" resultType="org.jeecg.modules.iost.ims.entity.Kingdeelog">
+
+        SELECT
+            k2.id, k2.name, k2.request, k2.response, k2.fail_reason, k2.create_by,
+            k2.createtime, k2.update_by, k2.update_time, k2.synchronization
+        FROM (
+            SELECT id FROM kingdeelog
+            <where>
+                <if test="dateForm != null and dateForm != ''">
+                    createtime BETWEEN #{dateForm} AND #{dateTo}
+                </if>
+                <if test="nameString != null and nameString != ''">
+                    AND `name` LIKE CONCAT("%", #{nameString}, "%")
+                </if>
+                <if test="synchronization != null and synchronization != ''">
+                    AND synchronization = #{synchronization}
+                </if>
+            </where>
+        ) AS k1 INNER JOIN kingdeelog AS k2 ON k1.id = k2.id
+        ORDER BY createtime DESC
+
+    </select>
+
+
+
 </mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/IKingdeelogService.java

 package org.jeecg.modules.iost.ims.service;
 
-import org.jeecg.modules.iost.ims.entity.Kingdeelog;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.iost.ims.entity.Kingdeelog;
 
 /**
  * @Description: ims金蝶日志
@@ -11,4 +12,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKingdeelogService extends IService<Kingdeelog> {
 
+    /**
+     * 金蝶日志列表
+     */
+    IPage<Kingdeelog> kingdeeLogList(Integer pageNo, Integer pageSize, String dateString, String nameString, String status);
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/KingdeelogServiceImpl.java

 package org.jeecg.modules.iost.ims.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.iost.ims.entity.Kingdeelog;
 import org.jeecg.modules.iost.ims.mapper.KingdeelogMapper;
 import org.jeecg.modules.iost.ims.service.IKingdeelogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 
 /**
  * @Description: ims金蝶日志
@@ -16,4 +21,33 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class KingdeelogServiceImpl extends ServiceImpl<KingdeelogMapper, Kingdeelog> implements IKingdeelogService {
 
+    @Autowired
+    private KingdeelogMapper kingdeelogMapper;
+
+
+    @Override
+    public IPage<Kingdeelog> kingdeeLogList(Integer pageNo, Integer pageSize, String dateString, String nameString, String status) {
+        String dateForm = "";
+        String dateTo = "";
+        if (StringUtils.isNotBlank(dateString)) {
+            String[] split = dateString.split(",");
+            dateForm = split[0];
+            dateTo = split[1];
+        }
+
+        String synchronization = "";
+        if ("1".equals(status)) {
+            synchronization = "true";
+        } else if ("2".equals(status)) {
+            synchronization = "false";
+        }
+
+        Page<Kingdeelog> page = new Page<>(pageNo, pageSize);
+        List<Kingdeelog> recordsList = kingdeelogMapper.kingdeeLogList(page, dateForm, dateTo, nameString, synchronization);
+
+        page.setRecords(recordsList);
+        return page;
+    }
+
+
 }

jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

@@ -73,10 +73,10 @@ public class SecurityToolsTest {
         //测试
         IdentifyInfo identifyInfo = new IdentifyInfo() {
         };
-        identifyInfo.setAppId("234279_W+8P58FOSIl839wH1Z4pTY/v0j2W5OrE");
-        identifyInfo.setAppSecret("b1e10c8eba814adbb15eb4b3efc200e6");
-        identifyInfo.setServerUrl("http://192.168.36.230/k3cloud/");
-        identifyInfo.setdCID("62e24a3cb44ac0");
+        identifyInfo.setAppId("235639_X48NSYlJTmo45VxJx+4rycwJVswXxqMt");
+        identifyInfo.setAppSecret("0f7adefd4d96479bb0e7052911018344");
+        identifyInfo.setServerUrl("http://192.168.0.30/k3cloud/");
+        identifyInfo.setdCID("632d69b1cb50fb");
         identifyInfo.setlCID(2052);
         identifyInfo.setUserName("Administrator");
         K3CloudApi k3CloudApi = new K3CloudApi(identifyInfo);