服务、任务、翻译、结果表修改

common/common_utils/src/main/java/com/founder/commonutils/newPublicEntity/SkRegionalsDetail.java

@@ -36,7 +36,7 @@ public class SkRegionalsDetail extends Model<SkRegionalsDetail> {
      */
     private String objecttypename;
     /**
-     * 对象类型 (czxx)
+     * 对象类型
      */
     private String objecttype;
     /**

common/common_utils/src/main/java/com/founder/commonutils/newPublicEntity/SkRegionalsPerson.java

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 人员信息表(SkRegionalsPerson)表实体类
@@ -75,6 +77,11 @@ public class SkRegionalsPerson extends Model<SkRegionalsPerson> {
      * 是否删除，0代表未删除，1代表删除
      */
     private String isdeleted;
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cjsj;
 
     /**
      * 获取主键值

common/common_utils/src/main/java/com/founder/commonutils/newPublicEntity/SkService.java

@@ -78,7 +78,10 @@ public class SkService extends Model<SkService> {
      * 服务异常
      */
     private String error;
-
+    /**
+     * 展示状态（服务申请），0代表不展示，1代表展示
+     */
+    private Integer flag;
 
     /**
      * 获取主键值

service/publicapi/pom.xml

@@ -13,8 +13,12 @@
     <build>
         <finalName>publicapi</finalName>
 
+
         <!--添加标签，防止编译时excel损坏-->
         <resources>
+
+
+
             <resource>
                 <directory>src/main/resources</directory>
                 <excludes>
@@ -34,6 +38,7 @@
         </resources>
 
     </build>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -41,5 +46,9 @@
             <version>3.1.11</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsDetailController.java

@@ -11,10 +11,12 @@ import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SkRegionalsDetail;
 import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
+import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkRegionalsDetailService;
 import com.founder.publicapi.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsDetailParam;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -35,6 +37,8 @@ public class SkRegionalsDetailController extends ApiController implements ExcelC
      */
     @Resource
     private SkRegionalsDetailService skRegionalsDetailService;
+    @Autowired
+    private SkDictionaryService skDictionaryService;
 
 
     /**
@@ -45,6 +49,7 @@ public class SkRegionalsDetailController extends ApiController implements ExcelC
     @OperLog(message = "新增结果翻译信息", operation = OperationType.ADD)
     public MapRestResult save(SkRegionalsDetail skRegionalsDetail) {
         skRegionalsDetail.setXxzjbh(KeyUtil.getUUIDKey("FY"));
+        skRegionalsDetail.setObjecttypename(skDictionaryService.findDmmcByDmAndDmlx(skRegionalsDetail.getObjecttype(), "ST"));
         boolean save = skRegionalsDetailService.save(skRegionalsDetail);
         if (save) {
             return new MapRestResult();
@@ -60,6 +65,7 @@ public class SkRegionalsDetailController extends ApiController implements ExcelC
     @ApiOperation(value = "修改结果翻译信息")
     @OperLog(message = "修改结果翻译信息", operation = OperationType.UPDATE)
     public MapRestResult update(SkRegionalsDetail skRegionalsDetail) {
+        skRegionalsDetail.setObjecttypename(skDictionaryService.findDmmcByDmAndDmlx(skRegionalsDetail.getObjecttype(), "ST"));
         boolean update = skRegionalsDetailService.updateById(skRegionalsDetail);
         if (update) {
             return new MapRestResult();
@@ -112,8 +118,14 @@ public class SkRegionalsDetailController extends ApiController implements ExcelC
         //分页
         Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
 
-
         QueryWrapper queryWrapper = new QueryWrapper();
+        if (skRegionalsDetailParam.getObjectvalue()!=null&&!"".equals(skRegionalsDetailParam.getObjectvalue())){
+            queryWrapper.like("objectValue",skRegionalsDetailParam.getObjectvalue());
+        }
+        if (skRegionalsDetailParam.getObjecttype()!=null&&!"".equals(skRegionalsDetailParam.getObjecttype())){
+            queryWrapper.eq("objectType",skRegionalsDetailParam.getObjecttype());
+        }
+
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.orderByDesc("fysj");
 

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsPersonController.java

@@ -128,8 +128,12 @@ public class SkRegionalsPersonController extends ApiController implements ExcelC
 
 
         QueryWrapper queryWrapper = new QueryWrapper();
+
+        if (skRegionalsDetailParam.getSfzhm()!=null&& !"".equals(skRegionalsDetailParam.getSfzhm())){
+            queryWrapper.like("sfzhm",skRegionalsDetailParam.getSfzhm());
+        }
         queryWrapper.eq("isDeleted", "0");
-//        queryWrapper.orderByDesc("djsj");
+        queryWrapper.orderByDesc("cjsj");
 
         IPage page1 = skRegionalsPersonService.page(page, queryWrapper);
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java

@@ -83,8 +83,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
         }
 
         skRegionalsResult.setObjecttypename(skDictionaryService.findDmmcByDmAndClass(skRegionalsResult.getObjecttype(),"SkRegionalsResult"));
-
-
+        System.out.println(skRegionalsResult);
         boolean update = skRegionalsResultService.updateById(skRegionalsResult);
         if (update) {
             return new MapRestResult();
@@ -139,6 +138,12 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
 
 
         QueryWrapper queryWrapper = new QueryWrapper();
+        if (skRegionalsDetailParam.getObjectvalue()!=null&&!"".equals(skRegionalsDetailParam.getObjectvalue())){
+            queryWrapper.like("objectValue",skRegionalsDetailParam.getObjectvalue());
+        }
+        if (skRegionalsDetailParam.getObjecttype()!=null&& !"".equals(skRegionalsDetailParam.getObjecttype())){
+            queryWrapper.like("objectType",skRegionalsDetailParam.getObjecttype());
+        }
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.orderByDesc("djsj");
 

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java

@@ -15,6 +15,7 @@ import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkRegionalsTaskService;
 import com.founder.publicapi.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
+import com.founder.publicapi.vo.param.SkRegionalsTaskParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -158,14 +159,21 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
     @PostMapping("query")
     @ApiOperation(value = "查询任务列表信息")
     @OperLog(message = "查询任务列表信息", operation = OperationType.QUERY)
-    public MapRestResult query(@RequestBody SkRegionalsPersonParam skRegionalsDetailParam) {
+    public MapRestResult query(@RequestBody SkRegionalsTaskParam skRegionalsDetailParam) {
         //分页
         Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
 
 
         QueryWrapper queryWrapper = new QueryWrapper();
+        if (skRegionalsDetailParam.getTaskname()!=null&&!"".equals(skRegionalsDetailParam.getTaskname())){
+            queryWrapper.like("taskName",skRegionalsDetailParam.getTaskname());
+        }
+        if (skRegionalsDetailParam.getTasktype()!=null&&!"".equals(skRegionalsDetailParam.getTasktype())){
+            queryWrapper.eq("taskType",skRegionalsDetailParam.getTasktype());
+        }
+
         queryWrapper.eq("isDeleted", "0");
-        queryWrapper.orderByDesc("fssj ");
+        queryWrapper.orderByDesc("fssj");
 
         IPage page1 = skRegionalsTaskService.page(page, queryWrapper);
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRelatedResultAllController.java

@@ -15,6 +15,7 @@ import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkRelatedResultAllService;
 import com.founder.publicapi.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
+import com.founder.publicapi.vo.param.SkRelatedResultAllParam;
 import com.founder.publicapi.vo.response.SkRelatedResultAllVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -120,12 +121,19 @@ public class SkRelatedResultAllController extends ApiController implements Excel
     @PostMapping("query")
     @ApiOperation(value = "查询关联关系列表信息")
     @OperLog(message = "查询关联关系列表信息", operation = OperationType.QUERY)
-    public MapRestResult query(@RequestBody SkRegionalsPersonParam skRegionalsDetailParam) {
+    public MapRestResult query(@RequestBody SkRelatedResultAllParam skRegionalsDetailParam) {
         //分页
         Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
 
 
         QueryWrapper queryWrapper = new QueryWrapper();
+        if (skRegionalsDetailParam.getObjectvalue()!=null&& !"".equals(skRegionalsDetailParam.getObjectvalue())){
+            queryWrapper.like("objectValue",skRegionalsDetailParam.getObjectvalue());
+        }
+        if (skRegionalsDetailParam.getObjecttype()!=null&& !"".equals(skRegionalsDetailParam.getObjecttype())){
+            queryWrapper.eq("objectType",skRegionalsDetailParam.getObjecttype());
+        }
+
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.orderByDesc("data");
 

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRelatedResultController.java

@@ -52,6 +52,12 @@ public class SkRelatedResultController extends ApiController {
 
 
         QueryWrapper queryWrapper = new QueryWrapper();
+        if (param.getObjectvalue()!=null&& !"".equals(param.getObjectvalue())){
+            queryWrapper.like("objectValue",param.getObjectvalue());
+        }
+        if (param.getObjecttype()!=null&& !"".equals(param.getObjecttype())){
+            queryWrapper.eq("objectType",param.getObjecttype());
+        }
         queryWrapper.eq("isDeleted", "0");
         IPage page1 = skRelatedResultService.page(page, queryWrapper);
         List<SkRelatedResult> list = page1.getRecords();
@@ -62,12 +68,6 @@ public class SkRelatedResultController extends ApiController {
         }
         return new MapRestResult(200, "OK", page1.getTotal(), newList);
 
-//        List<SkRelatedResult> records = page1.getRecords();
-//        List<SkRelatedResultVO> list=new ArrayList<>();
-//        for (SkRelatedResult result:records) {
-//            list.add(resultToVo(result));
-//        }
-//        return new MapRestResult(200, "OK", page1.getTotal(), list);
     }
 
     /**

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceApplyController.java

@@ -115,15 +115,12 @@ public class SkServiceApplyController extends ApiController {
     @ApiOperation(value = "删除服务授权信息")
     @OperLog(message = "删除服务授权信息", operation = OperationType.DELETE)
     public MapRestResult deleteById(String xxzjbh) {
-        SkServiceApply skService = new SkServiceApply();
-        skService.setXxzjbh(xxzjbh);
-        skService.setIsdeleted("1");
 
-        boolean update = skServiceApplyService.updateById(skService);
+        boolean update = skServiceApplyService.removeById(xxzjbh);
         if (update) {
             return new MapRestResult();
         } else {
-            return new MapRestResult().error("更新失败");
+            return new MapRestResult().error("删除失败");
         }
     }
 
@@ -139,10 +136,10 @@ public class SkServiceApplyController extends ApiController {
             return new MapRestResult().error("不存在该数据");
         } else {
             QueryWrapper queryWrapper=new QueryWrapper();
-            queryWrapper.select("serviceName");
+            queryWrapper.select("serviceName","serviceMs");
             queryWrapper.eq("xxzjbh",byId.getServiceid());
             Map<String,Object> map = service.getMap(queryWrapper);
-            return new MapRestResult(new SkServiceApplyVO(byId, (String) map.get("serviceName")));
+            return new MapRestResult(new SkServiceApplyVO(byId,map==null?"": (String) map.get("serviceName"),map==null?"":(String) map.get("serviceMs")));
         }
     }
 
@@ -153,31 +150,11 @@ public class SkServiceApplyController extends ApiController {
     @ApiOperation(value = "查询服务授权列表信息")
     @OperLog(message = "查询服务授权列表信息", operation = OperationType.QUERY)
     public MapRestResult query(@RequestBody SkServiceApplyParam skRegionalsDetailParam) {
-        //分页
-        Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
-
-
-        QueryWrapper queryWrapper = new QueryWrapper();
-
-
-        queryWrapper.eq("isDeleted", "0");
-        queryWrapper.orderByDesc("sqsj");
-
-        IPage page1 = skServiceApplyService.page(page, queryWrapper);
-
-        List<SkServiceApply> records = page1.getRecords();
-        List<SkServiceApplyVO> list = new ArrayList<>();
-        Map<String,Object> map =null;
-        for (SkServiceApply skServiceApply:records) {
-            queryWrapper=new QueryWrapper();//重置
-            queryWrapper.select("serviceName");
-            queryWrapper.eq("xxzjbh",skServiceApply.getServiceid());
-            map = service.getMap(queryWrapper);
-
-            list.add(new SkServiceApplyVO(skServiceApply, map==null?"":(String) map.get("serviceName")));
-        }
+        Map<String, Object> all = skServiceApplyService.findAll(skRegionalsDetailParam);
+        Integer count= (Integer) all.get("count");
+        List<SkServiceApplyVO> list= (List<SkServiceApplyVO>) all.get("list");
 
-        return new MapRestResult(200, "OK", page1.getTotal(), list);
+        return new MapRestResult(200, "OK", count, list);
 
     }
 

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkServiceController.java

@@ -125,29 +125,60 @@ public class SkServiceController extends ApiController {
         if (skRegionalsDetailParam.getName()!=null&& !skRegionalsDetailParam.getName().equals("")){
             queryWrapper.like("serviceName",skRegionalsDetailParam.getName());
         }
+        if (skRegionalsDetailParam.getDes()!=null&& !skRegionalsDetailParam.getDes().equals("")){
+            queryWrapper.like("serviceMs",skRegionalsDetailParam.getDes());
+        }
 
         queryWrapper.eq("isDeleted", "0");
         queryWrapper.orderByDesc("cjsj");
 
         IPage page1 = skServiceService.page(page, queryWrapper);
-        List<SkService> serviceList=page1.getRecords();
-        int count=0;//表示成功数量
-        for (SkService skService:serviceList) {
-            String s = UrlUtil.httpPost(UrlUtil.solve(skService));
-            System.out.println("123::::"+s);
-            if (s.contains("\"status\":200")||(skService.getServicename().equals("/skbs/getSkbs")&& !StringUtil.isEmpty(s))){//不包含status等于200得默认失败
-                skService.setContent(s);
-                count++;
-            }else {
-                skService.setError(s);
-                skService.setStatus("1");
-                System.out.println("错误服务："+skService.getServicename());
-            }
+        return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
+
+    }
+
+    /**
+     * 查询服务申请列表信息（分页）
+     */
+    @PostMapping("queryApply")
+    @ApiOperation(value = "查询服务申请列表信息")
+    @OperLog(message = "查询服务申请列表信息", operation = OperationType.QUERY)
+    public MapRestResult queryApply(@RequestBody SkServiceParam skRegionalsDetailParam) {
+        //分页
+        Page page = new Page(skRegionalsDetailParam.getPage(), skRegionalsDetailParam.getPageSize());
+
+
+        QueryWrapper queryWrapper = new QueryWrapper();
+
+        if (skRegionalsDetailParam.getName()!=null&& !skRegionalsDetailParam.getName().equals("")){
+            queryWrapper.like("serviceName",skRegionalsDetailParam.getName());
         }
-        System.out.println("count:"+count);
+
+        queryWrapper.eq("isDeleted", "0");
+        queryWrapper.eq("flag",1);
+        queryWrapper.orderByDesc("cjsj");
+
+        IPage page1 = skServiceService.page(page, queryWrapper);
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
 
     }
 
+
+    @PostMapping("updateFlag")
+    @ApiOperation(value = "更新服务列表展示状态")
+    @OperLog(message = "更新服务列表展示状态", operation = OperationType.UPDATE)
+    public MapRestResult queryApply(String xxzjbh,Integer flag) {
+        SkService skService=skServiceService.getById(xxzjbh);
+        skService.setFlag(flag);
+        boolean updateById = skServiceService.updateById(skService);
+        if (updateById) {
+            return new MapRestResult();
+        } else {
+            return new MapRestResult().error();
+        }
+    }
+
+
+
 }
 

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SysUserController.java

@@ -32,7 +32,7 @@ import static com.founder.commonutils.util.AesEncryptUtil.desEncrypt;
  * @since 2022-03-17 14:09:46
  */
 @RestController
-@RequestMapping("user")
+@RequestMapping("/user")
 public class SysUserController extends ApiController {
     /**
      * 服务对象

service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterceptorController.java

@@ -67,11 +67,11 @@ public class SkInterceptorController extends ApiController {
     }
 
     /**
-     * 删除拦截器
+     * 修改拦截器状态
      */
     @PostMapping("remove")
-    @ApiOperation(value = "删除拦截器信息")
-    @OperLog(message = "删除拦截器信息",operation = OperationType.DELETE)
+    @ApiOperation(value = "修改拦截器状态")
+    @OperLog(message = "修改拦截器状态",operation = OperationType.UPDATE)
     public MapRestResult deleteById(String id,String type) {//0代表开启，1代表关闭
         SkInterceptor byId = skInterceptorService.getById(id);
         byId.setIsdeleted(type);
@@ -84,6 +84,21 @@ public class SkInterceptorController extends ApiController {
     }
 
     /**
+     * 删除拦截器信息
+     */
+    @PostMapping("delete")
+    @ApiOperation(value = "删除拦截器信息")
+    @OperLog(message = "删除拦截器信息",operation = OperationType.DELETE)
+    public MapRestResult deleteById(String id) {//0代表开启，1代表关闭
+        boolean flag = skInterceptorService.removeById(id);
+        if (flag){
+            return new MapRestResult();
+        }else {
+            return new MapRestResult().error();
+        }
+    }
+
+    /**
      * 查询详情
      */
     @PostMapping("detail")

service/publicapi/src/main/java/com/founder/publicapi/interceptor/TokenInterceptor.java

@@ -40,9 +40,9 @@ public class TokenInterceptor implements HandlerInterceptor {
 
     private JwtUser jwtUser = new JwtUser();
 
-    private boolean flag=true;//true代表用户登录，false代表第三方登录
+    private boolean flag = true;//true代表用户登录，false代表第三方登录
 
-    private String name="";//服务名称
+    private String name = "";//服务名称
 
     public String getName() {
         return name;
@@ -63,58 +63,65 @@ public class TokenInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         String thirdauthorization = JwtUser.getHeadToken(request, "thirdauthorization");
-        String str="";
+        String str = "";
+        System.out.println(request.getRequestURL());
         if (thirdauthorization != null && !"".equals(thirdauthorization)) {//有thirdauthorization，第三方登录
             Claims claims = null;
-            flag=false;
+            flag = false;
             try {
+                System.out.println("thirdauthorization:"+thirdauthorization);
                 claims = jwtUser.parseJWT(thirdauthorization);
                 String sub = (String) claims.get("sub");
                 JSONObject object = new JSONObject(sub);
                 ThirdToken token = new ThirdToken(object);
                 System.out.println(token);
-                str= verifyToken(token);
-                if (str.equals("")){
-                    name=token.getServiceName();
+                str = verifyToken(token);
+                if (str.equals("")) {
+                    name = token.getServiceName();
                     return true;
-                }else {
+                } else {
                     Map<String, Object> map = getMap(401, str);
                     ResultUtil.responseJson(response, map);
                     return false;
                 }
             } catch (TokenException e) {
                 System.out.println(e.getMessage());
-                Map<String, Object> map = getMap(401, e.getMessage());
+                Map<String, Object> map = getMap(401, "第三方" + e.getMessage());
                 ResultUtil.responseJson(response, map);
                 return false;
             }
         } else {
-            flag=true;
+            flag = true;
             String authorization = JwtUser.getHeadToken(request, "authorization");
             Claims claims = null;
             try {
-                claims = jwtUser.parseJWT(authorization);
-                String sub = (String) claims.get("sub");
-                JSONObject object = new JSONObject(sub);
-                Token token = new Token(object);
-                System.out.println(token);
-                str = verifyToken(token);
-                if (str.equals("")){
-                    return true;
-                }else {//账号、密码不匹配
-                    Map<String, Object> map = getMap(401, str);
+                System.out.println("authorization:"+thirdauthorization);
+                if (authorization == null || "".equals(authorization)) {
+                    Map<String, Object> map = getMap(401, "没有用户token信息");
                     ResultUtil.responseJson(response, map);
                     return false;
+                } else {
+                    claims = jwtUser.parseJWT(authorization);
+                    String sub = (String) claims.get("sub");
+                    JSONObject object = new JSONObject(sub);
+                    Token token = new Token(object);
+                    System.out.println(token);
+                    str = verifyToken(token);
+                    if (str.equals("")) {
+                        return true;
+                    } else {//账号、密码不匹配
+                        Map<String, Object> map = getMap(401, str);
+                        ResultUtil.responseJson(response, map);
+                        return false;
+                    }
                 }
             } catch (TokenException e) {
                 System.out.println(e.getMessage());
-                Map<String, Object> map = getMap(401, e.getMessage());
+                Map<String, Object> map = getMap(401,"用户"+ e.getMessage());
                 ResultUtil.responseJson(response, map);
                 return false;
             }
         }
-
-
     }
 
     @Override
@@ -129,16 +136,16 @@ public class TokenInterceptor implements HandlerInterceptor {
 
     /**
      * 校验token
-    */
-    public String verifyToken(Token token){
-        QueryWrapper queryWrapper=new QueryWrapper();
-        queryWrapper.eq("username",token.getUsername());
-        queryWrapper.eq("password",token.getPassword());
-        queryWrapper.eq("SCBZ",0);
+     */
+    public String verifyToken(Token token) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("username", token.getUsername());
+        queryWrapper.eq("password", token.getPassword());
+        queryWrapper.eq("SCBZ", 0);
         SysUser one = sysUserService.getOne(queryWrapper);
-        if (one==null){
+        if (one == null) {
             return "账号、密码不正确";
-        }else {
+        } else {
             return "";
         }
     }
@@ -146,23 +153,23 @@ public class TokenInterceptor implements HandlerInterceptor {
     /**
      * 校验第三方token
      */
-    public String verifyToken(ThirdToken token){
-        String str="";
-        QueryWrapper queryWrapper=new QueryWrapper();
-        queryWrapper.eq("applyGs",token.getGsNama());
-        queryWrapper.eq("applyUrl",token.getIp());
-        queryWrapper.eq("status","1");
+    public String verifyToken(ThirdToken token) {
+        String str = "";
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("applyGs", token.getGsNama());
+        queryWrapper.eq("applyUrl", token.getIp());
+        queryWrapper.eq("status", "1");
         List<SkServiceApply> list = skServiceApplyService.list(queryWrapper);
-        if (list==null||list.size()==0){
-            str="请检查公司名称、ip是否对应";
-        }else {
-            QueryWrapper queryWrapper1=new QueryWrapper();
-            queryWrapper1.eq("serviceName",token.getServiceName());
+        if (list == null || list.size() == 0) {
+            str = "请检查公司名称、ip是否对应";
+        } else {
+            QueryWrapper queryWrapper1 = new QueryWrapper();
+            queryWrapper1.eq("serviceName", token.getServiceName());
             List<String> serviceIds = getServiceIds(list);
-            queryWrapper1.in("xxzjbh",serviceIds);
+            queryWrapper1.in("xxzjbh", serviceIds);
             List<SkService> list1 = service.list(queryWrapper1);
-            if (list1==null||list1.size()==0){
-                str="该公司没有对应得服务名称";
+            if (list1 == null || list1.size() == 0) {
+                str = "该公司没有对应得服务名称";
             }
         }
 
@@ -172,10 +179,10 @@ public class TokenInterceptor implements HandlerInterceptor {
 
     /**
      * 获取服务id
-    */
-    public List<String> getServiceIds(List<SkServiceApply> list){
-        List<String> ids=new ArrayList<>();
-        for (SkServiceApply skServiceApply:list) {
+     */
+    public List<String> getServiceIds(List<SkServiceApply> list) {
+        List<String> ids = new ArrayList<>();
+        for (SkServiceApply skServiceApply : list) {
             ids.add(skServiceApply.getServiceid());
         }
         return ids;

service/publicapi/src/main/java/com/founder/publicapi/logs/SysLogAspect.java

@@ -104,7 +104,7 @@ public class SysLogAspect {
                 String sub = (String) claims.get("sub");
                 JSONObject object = new JSONObject(sub);
                 ThirdToken token = new ThirdToken(object);
-                System.out.println(token);
+                System.out.println("thirdToken===>"+token);
                 sysLog.setUserid(token.getGsNama());
             } catch (TokenException e) {
                 sysLog.setUserid("system");
@@ -116,7 +116,7 @@ public class SysLogAspect {
                 String sub = (String) claims.get("sub");
                 JSONObject object = new JSONObject(sub);
                 Token token = new Token(object);
-                System.out.println(token);
+                System.out.println("token===>"+token);
                 sysLog.setUserid(token.getUsername());
             } catch (
                     TokenException e) {
@@ -158,6 +158,7 @@ public class SysLogAspect {
         System.out.println("============================================2.请求开始：" + df.format(new
 
                 Date()) + "============================================");
+        System.out.println("URL===>"+request.getRequestURL());
         System.out.println("用户===>" + sysLog.getUserid());
         System.out.println("请求ip===>" + sysLog.getIp());
         System.out.println("请求的方法===>" + sysLog.getMessage());
@@ -165,6 +166,7 @@ public class SysLogAspect {
         System.out.println("传入参数===>" + sysLog.getParams());
         System.out.println("返回结果===>" + sysLog.getContent());
         System.out.println("总耗时===>" + sysLog.getTotaltime());
+        sysLog.setIp(request.getRequestURL().toString());
         System.out.println("===========================================2.请求结束：" + df.format(new
 
                 Date()) + "============================================");

service/publicapi/src/main/java/com/founder/publicapi/logs/controller/SkSysLogController.java

@@ -42,7 +42,7 @@ public class SkSysLogController {
         QueryWrapper queryWrapper = new QueryWrapper();
         SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
         if (logParam.getIp() != null && !logParam.getIp().equals("")) {
-            queryWrapper.eq("ip", logParam.getIp());
+            queryWrapper.like("ip", logParam.getIp());
         }
 
         if (logParam.getUserId() != null && !logParam.getUserId().equals("")) {

service/publicapi/src/main/java/com/founder/publicapi/mapper/SkInterceptorDao.java → service/publicapi/src/main/java/com/founder/publicapi/mapper/SkInterceptorMapper.java

@@ -9,7 +9,7 @@ import com.founder.commonutils.newPublicEntity.SkInterceptor;
  * @author jlt
  * @since 2022-03-28 09:05:17
  */
-public interface SkInterceptorDao extends BaseMapper<SkInterceptor> {
+public interface SkInterceptorMapper extends BaseMapper<SkInterceptor> {
 
 }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/SkServiceApplyMapper.java

@@ -2,6 +2,11 @@ package com.founder.publicapi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.founder.commonutils.newPublicEntity.SkServiceApply;
+import com.founder.publicapi.vo.param.SkServiceApplyParam;
+import com.founder.publicapi.vo.response.SkServiceApplyVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
 
 /**
  * 服务授权表(SkServiceApply)表数据库访问层
@@ -9,7 +14,12 @@ import com.founder.commonutils.newPublicEntity.SkServiceApply;
  * @author jlt
  * @since 2022-03-22 17:39:01
  */
+@Mapper
 public interface SkServiceApplyMapper extends BaseMapper<SkServiceApply> {
 
+
+    int count(SkServiceApplyParam skRegionalsDetailParam);
+
+    List<SkServiceApplyVO> findAll(SkServiceApplyParam skRegionalsDetailParam);
 }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/TestMapper.java

+package com.founder.publicapi.mapper;
+
+import com.founder.publicapi.vo.param.SkServiceApplyParam;
+import com.founder.publicapi.vo.response.SkServiceApplyVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TestMapper {
+    int count(SkServiceApplyParam skRegionalsDetailParam);
+
+    List<SkServiceApplyVO> findAll(SkServiceApplyParam skRegionalsDetailParam);
+
+}

service/publicapi/src/main/java/com/founder/publicapi/mapper/xml/SkServiceApplyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.publicapi.mapper.SkServiceApplyMapper">
+
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(distinct a.xxzjbh)
+        from sk_service_apply a,sk_service
+        where a.isDeleted='0'
+        <if test="servicename!= null and servicename!=''">
+            AND serviceName= #{ servicename , jdbcType=VARCHAR }
+        </if>
+        <if test="servicems!= null and servicems!=''">
+            AND serviceMs= #{ servicems , jdbcType=VARCHAR }
+        </if>
+        <if test="applygs!= null and applygs!=''">
+            AND a.applyGs= #{ applygs , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlb!= null and ajlb!=''">
+            AND a.applyUrl= #{ applyurl , jdbcType=VARCHAR }
+        </if>
+    </select>
+
+    <select id="findAll" resultType="com.founder.publicapi.vo.response.SkServiceApplyVO">
+        select a.xxzjbh, serviceMs,serviceName,serviceId, applyGs, applyRy, applyUrl, time, token, a.content,
+        a.isDeleted, sqsj, a.status
+        from sk_service_apply a,sk_service
+        where isDeleted='0'
+        <if test="servicename!= null and servicename!=''">
+            AND serviceName= #{ servicename , jdbcType=VARCHAR }
+        </if>
+        <if test="servicems!= null and servicems!=''">
+            AND serviceMs= #{ servicems , jdbcType=VARCHAR }
+        </if>
+        <if test="applygs!= null and applygs!=''">
+            AND a.applyGs= #{ applygs , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlb!= null and ajlb!=''">
+            AND a.applyUrl= #{ applyurl , jdbcType=VARCHAR }
+        </if>
+        limit #{page},#{pageSize}
+    </select>
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/xml/TestMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.founder.publicapi.mapper.TestMapper">
+
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(distinct a.xxzjbh)
+        from sk_service_apply a,sk_service
+        where a.isDeleted='0'
+        <if test="servicename!= null and servicename!=''">
+            AND serviceName= #{ servicename , jdbcType=VARCHAR }
+        </if>
+        <if test="servicems!= null and servicems!=''">
+            AND serviceMs= #{ servicems , jdbcType=VARCHAR }
+        </if>
+        <if test="applygs!= null and applygs!=''">
+            AND a.applyGs= #{ applygs , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlb!= null and ajlb!=''">
+            AND a.applyUrl= #{ applyurl , jdbcType=VARCHAR }
+        </if>
+    </select>
+
+    <select id="findAll" resultType="com.founder.publicapi.vo.response.SkServiceApplyVO">
+        select a.xxzjbh, serviceMs,serviceName,serviceId, applyGs, applyRy, applyUrl, time, token, a.content,
+        a.isDeleted, sqsj, a.status
+        from sk_service_apply a,sk_service
+        where isDeleted='0'
+        <if test="servicename!= null and servicename!=''">
+            AND serviceName= #{ servicename , jdbcType=VARCHAR }
+        </if>
+        <if test="servicems!= null and servicems!=''">
+            AND serviceMs= #{ servicems , jdbcType=VARCHAR }
+        </if>
+        <if test="applygs!= null and applygs!=''">
+            AND a.applyGs= #{ applygs , jdbcType=VARCHAR }
+        </if>
+        <if test="ajlb!= null and ajlb!=''">
+            AND a.applyUrl= #{ applyurl , jdbcType=VARCHAR }
+        </if>
+        limit #{page},#{pageSize}
+    </select>
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/service/SkServiceApplyService.java

@@ -2,6 +2,9 @@ package com.founder.publicapi.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.founder.commonutils.newPublicEntity.SkServiceApply;
+import com.founder.publicapi.vo.param.SkServiceApplyParam;
+
+import java.util.Map;
 
 /**
  * 服务授权表(SkServiceApply)表服务接口
@@ -11,5 +14,7 @@ import com.founder.commonutils.newPublicEntity.SkServiceApply;
  */
 public interface SkServiceApplyService extends IService<SkServiceApply> {
 
+    Map<String,Object> findAll(SkServiceApplyParam skRegionalsDetailParam);
+
 }
 

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkDictionaryServiceImpl.java

@@ -85,6 +85,7 @@ public class SkDictionaryServiceImpl extends ServiceImpl<SkDictionaryMapper, SkD
         map.put("SkTrail","GJ");
         map.put("SkRegionalsTask","ZF");
         map.put("SkRegionalsResult","ST");
+        map.put("SkRegionalsDetail","ST");
     }
 }
 

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkInterceptorServiceImpl.java

 package com.founder.publicapi.service.serviceimpl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.founder.publicapi.mapper.SkInterceptorDao;
+import com.founder.publicapi.mapper.SkInterceptorMapper;
 import com.founder.commonutils.newPublicEntity.SkInterceptor;
 import com.founder.publicapi.service.SkInterceptorService;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @since 2022-03-28 09:05:17
  */
 @Service("skInterceptorService")
-public class SkInterceptorServiceImpl extends ServiceImpl<SkInterceptorDao, SkInterceptor> implements SkInterceptorService {
+public class SkInterceptorServiceImpl extends ServiceImpl<SkInterceptorMapper, SkInterceptor> implements SkInterceptorService {
 
 }
 

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkServiceApplyServiceImpl.java

@@ -3,9 +3,17 @@ package com.founder.publicapi.service.serviceimpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.founder.publicapi.mapper.SkServiceApplyMapper;
 import com.founder.commonutils.newPublicEntity.SkServiceApply;
+import com.founder.publicapi.mapper.TestMapper;
 import com.founder.publicapi.service.SkServiceApplyService;
+import com.founder.publicapi.vo.param.SkServiceApplyParam;
+import com.founder.publicapi.vo.response.SkServiceApplyVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 服务授权表(SkServiceApply)表服务实现类
  *
@@ -15,5 +23,16 @@ import org.springframework.stereotype.Service;
 @Service("skServiceApplyService")
 public class SkServiceApplyServiceImpl extends ServiceImpl<SkServiceApplyMapper, SkServiceApply> implements SkServiceApplyService {
 
+
+    @Override
+    public Map<String, Object> findAll(SkServiceApplyParam skRegionalsDetailParam) {
+        Map<String,Object> map=new HashMap<>();
+        int count=baseMapper.count(skRegionalsDetailParam);
+        skRegionalsDetailParam.setPage((skRegionalsDetailParam.getPage()-1)*skRegionalsDetailParam.getPageSize());
+        List<SkServiceApplyVO> list=baseMapper.findAll(skRegionalsDetailParam);
+        map.put("count",count);
+        map.put("list",list);
+        return map;
+    }
 }
 

service/publicapi/src/main/java/com/founder/publicapi/util/ExcelUtil.java

@@ -204,7 +204,8 @@ public class ExcelUtil {
                                         (className.equals("SkTrail") ||
                                                 className.equals("SkPointlocation")||
                                                 className.equals("SkRegionalsResult")||
-                                                className.equals("SkRegionalsTask"))) {//轨迹、点位需设置type
+                                                className.equals("SkRegionalsTask")||
+                                                className.equals("SkRegionalsDetail"))) {//轨迹、点位需设置type
                                     fields[j+1].setAccessible(true);
                                     fields[j+1].set(o,skDictionaryService.findDmmcByDmAndClass(fields[j].get(o).toString(),className));
                                     j++;//属性下标+1
@@ -264,7 +265,11 @@ public class ExcelUtil {
             }
             if(field.getName().equals("firstdata")){
                 num++;
-            }if(field.getName().equals("data")){
+            }
+            if(field.getName().equals("data")){
+                num++;
+            }
+            if(field.getName().equals("cjsj")){
                 num++;
             }
         }

service/publicapi/src/main/java/com/founder/publicapi/util/UrlUtil.java

@@ -39,10 +39,7 @@ public class UrlUtil {
         return map;
     }
 
-    /***
-     * 调用外部人像接口
-     * @return
-     */
+
     public static String httpPost(Map<String, Object> map) {
         URL connect;
         StringBuffer data = new StringBuffer();

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsDetailParam.java

@@ -10,6 +10,14 @@ import lombok.Data;
 @Data
 public class SkRegionalsDetailParam {
     /**
+     * 实体值
+    */
+    private String objectvalue;
+    /**
+     * 实体类型
+     */
+    private String objecttype;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsPersonParam.java

@@ -9,6 +9,10 @@ import lombok.Data;
 @Data
 public class SkRegionalsPersonParam {
     /**
+     * 身份证号码
+    */
+    private String sfzhm;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsResultParam.java

@@ -10,6 +10,14 @@ import lombok.Data;
 @Data
 public class SkRegionalsResultParam {
     /**
+     * 类型
+     */
+    private String objecttype;
+    /**
+     * 实体值
+     */
+    private String objectvalue;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRegionalsTaskParam.java

@@ -10,6 +10,14 @@ import lombok.Data;
 @Data
 public class SkRegionalsTaskParam {
     /**
+     * 任务名称
+     */
+    private String taskname;
+    /**
+     * 任务类型，详见任务类型-类型名称对照表
+     */
+    private String tasktype;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRelatedResultAllParam.java

@@ -9,6 +9,14 @@ import lombok.Data;
 @Data
 public class SkRelatedResultAllParam {
     /**
+     * 实体类型,详见实体类型-类型名称对照表
+     */
+    private String objecttype;
+    /**
+     * 实体值
+     */
+    private String objectvalue;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkRelatedResultParam.java

@@ -9,6 +9,14 @@ import lombok.Data;
 @Data
 public class SkRelatedResultParam {
     /**
+     * 类型
+     */
+    private String objecttype;
+    /**
+     * 实体值
+     */
+    private String objectvalue;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkServiceApplyParam.java

@@ -10,6 +10,22 @@ import lombok.Data;
 @Data
 public class SkServiceApplyParam {
     /**
+     * 服务名称
+     */
+    private String servicename;
+    /**
+     * 服务描述
+     */
+    private String servicems;
+    /**
+     * 申请公司
+     */
+    private String applygs;
+    /**
+     * 申请ip
+     */
+    private String applyurl;
+    /**
      * 行数
      */
     private Integer page;

service/publicapi/src/main/java/com/founder/publicapi/vo/param/SkServiceParam.java

@@ -10,6 +10,10 @@ import lombok.Data;
 @Data
 public class SkServiceParam {
     /**
+     * 服务描述
+    */
+    private String des;
+    /**
      * 服务名称
     */
     private String name;

service/publicapi/src/main/java/com/founder/publicapi/vo/response/SkServiceApplyVO.java

@@ -21,6 +21,10 @@ public class SkServiceApplyVO {
      */
     private String servicename;
     /**
+     * 服务描述
+     */
+    private String servicems;
+    /**
      * 申请公司
      */
     private String applygs;
@@ -43,9 +47,10 @@ public class SkServiceApplyVO {
     private String content;
 
     public SkServiceApplyVO(){}
-    public SkServiceApplyVO(SkServiceApply skServiceApply, String name){
+    public SkServiceApplyVO(SkServiceApply skServiceApply, String name,String ms){
         BeanUtils.copyProperties(skServiceApply,this);
         StringUtil.toUTF8(content);
         this.servicename=name;
+        this.servicems=ms;
     }
 }

service/publicapi/src/main/resources/bootstrap.properties

@@ -20,7 +20,7 @@ spring.datasource.password=gkptCcYy123
 #spring.datasource.username=XZXT
 #spring.datasource.password=XzPwd#11022
 #xml扫包
-mybatis-plus.mapper-locations=classpath:com/founder/publicapi/**/*.xml
+mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/xml/*.xml
 #es健康检查关闭
 management.health.elasticsearch.enabled=false