Merge branch 'skyp_bzApi' of http://39.99.224.27:9022/changchao/map-parent into skyp_bzApi

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

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

common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java

 package com.founder.commonutils.util;
 
 
+import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
 /**
@@ -48,6 +51,16 @@ public class Base64Util {
 			return null;
 		}
 	}
+
+	/**
+	 * 图片转成base64字符串
+	 */
+	public static String getBase64(MultipartFile imageFile) throws IOException {
+		BASE64Encoder base64Encoder =new BASE64Encoder();
+		String base64EncoderImg =base64Encoder.encode(imageFile.getBytes());
+		return base64EncoderImg;
+	}
+
 	public static void main(String[] args) {
 		System.out.println(Base64Util.encode("0"));
 		System.out.println(Base64Util.decode("MA=="));

service/publicapi/src/main/java/com/founder/publicapi/util/DateUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/DateUtil.java

-package com.founder.publicapi.util;
+package com.founder.commonutils.util;
 
 import java.text.DateFormat;
 import java.text.ParseException;

service/publicapi/src/main/java/com/founder/publicapi/util/FileUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/FileUtil.java

-package com.founder.publicapi.util;
+package com.founder.commonutils.util;
 
 
 

service/publicapi/src/main/java/com/founder/publicapi/util/JsonUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/JsonUtil.java

-package com.founder.publicapi.util;
+package com.founder.commonutils.util;
 
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.*;
 import java.util.UUID;

service/publicapi/src/main/java/com/founder/publicapi/util/ResultUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/ResultUtil.java

-package com.founder.publicapi.util;
+package com.founder.commonutils.util;
 
 import com.alibaba.fastjson.JSON;
 

service/publicapi/src/main/java/com/founder/publicapi/util/SpringUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/SpringUtil.java

-package com.founder.publicapi.util;
+package com.founder.commonutils.util;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

common/common_utils/src/main/java/com/founder/commonutils/util/StringUtil.java

@@ -120,4 +120,55 @@ public class StringUtil {
 			return null;
 		}
 	}
+
+	public static String toUTF8(String str) {
+
+		if (isEmpty(str)) {
+			return "";
+		}
+		try {
+
+			if (str.equals(new String(str.getBytes("GB2312"), "GB2312"))) {
+
+				str = new String(str.getBytes("GB2312"), "utf-8");
+
+				return str;
+
+			}
+
+		} catch (Exception exception) {
+
+		}
+
+		try {
+
+			if (str.equals(new String(str.getBytes("ISO-8859-1"), "ISO-8859-1"))) {
+
+				str = new String(str.getBytes("ISO-8859-1"), "utf-8");
+
+				return str;
+
+			}
+
+		} catch (Exception exception1) {
+
+		}
+
+		try {
+
+			if (str.equals(new String(str.getBytes("GBK"), "GBK"))) {
+
+				str = new String(str.getBytes("GBK"), "utf-8");
+
+				return str;
+
+			}
+
+		} catch (Exception exception3) {
+
+		}
+
+		return str;
+
+	}
 }

service/publicapi/src/main/java/com/founder/publicapi/util/UrlUtil.java → common/common_utils/src/main/java/com/founder/commonutils/util/UrlUtil.java

-package com.founder.publicapi.util;
+package com.founder.commonutils.util;
 
 import com.founder.commonutils.newPublicEntity.SkService;
 

service/asj/src/main/java/com/founder/asj/controller/TbStAsjController.java

@@ -15,8 +15,6 @@ import com.founder.commonutils.publicEntity.SysUser;
 import com.founder.publicapi.logs.OperLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.founder.publicapi.logs.OperationType;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;

service/publicapi/pom.xml

@@ -28,6 +28,13 @@
                 <filtering>true</filtering>
             </resource>
             <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
                 <directory>src/main/resources</directory>
                 <includes>
                     <include>**/*.xls</include>

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

 package com.founder.publicapi;
 
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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

@@ -10,7 +10,7 @@ import com.founder.commonutils.newPublicEntity.SkDictionary;
 import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkDictionaryService;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkDictionaryParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.util.DateUtil;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SkPointlocation;
@@ -13,8 +14,7 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkPointlocationService;
-import com.founder.publicapi.util.DateUtil;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkPointlocationParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -13,7 +13,7 @@ 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.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsDetailParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.util.Base64Util;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SkRegionalsPerson;
 import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkRegionalsPersonService;
-import com.founder.publicapi.util.Base64Util;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsPersonParam;
 import com.founder.publicapi.vo.param.SkRegionalsPersonSaveParam;
 import io.swagger.annotations.ApiOperation;

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.util.Base64Util;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SkRegionalsResult;
@@ -13,8 +14,7 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkRegionalsResultService;
-import com.founder.publicapi.util.Base64Util;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsResultParam;
 import com.founder.publicapi.vo.param.SkRegionalsResultSaveParam;
 import io.swagger.annotations.ApiOperation;

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

@@ -13,8 +13,7 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 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.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRegionalsTaskParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -13,8 +13,7 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 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.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkRelatedResultAllParam;
 import com.founder.publicapi.vo.response.SkRelatedResultAllVO;
 import io.swagger.annotations.ApiOperation;

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

@@ -11,8 +11,6 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkServiceService;
-import com.founder.publicapi.util.StringUtil;
-import com.founder.publicapi.util.UrlUtil;
 import com.founder.publicapi.vo.param.SkServiceParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 服务列表(SkService)表控制层
@@ -137,46 +134,6 @@ public class SkServiceController extends ApiController {
 
     }
 
-    /**
-     * 查询服务申请列表信息（分页）
-     */
-    @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());
-        }
-
-        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/SkServiceSqController.java

+package com.founder.publicapi.controller.SkDataOperation;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.founder.commonutils.newPublicEntity.SkService;
+import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.publicapi.logs.OperLog;
+import com.founder.publicapi.logs.OperationType;
+import com.founder.publicapi.service.SkDictionaryService;
+import com.founder.publicapi.service.SkServiceService;
+import com.founder.publicapi.vo.param.SkServiceParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 服务申请controller层
+ * @author jlt
+ * @date 2022/03/31/
+ */
+@RestController
+@RequestMapping("skServiceSq")
+public class SkServiceSqController {
+
+    /**
+     * 服务对象
+     */
+    @Resource
+    private SkServiceService skServiceService;
+    @Autowired
+    private SkDictionaryService skDictionaryService;
+
+    /**
+     * 查询服务申请列表信息（分页）
+     */
+    @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());
+        }
+        if (skRegionalsDetailParam.getDes()!=null&& !skRegionalsDetailParam.getDes().equals("")){
+            queryWrapper.like("serviceMs",skRegionalsDetailParam.getDes());
+        }
+
+        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,String 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/SkTrailController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.util.Base64Util;
+import com.founder.commonutils.util.DateUtil;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SkTrail;
@@ -13,9 +15,7 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkTrailService;
-import com.founder.publicapi.util.Base64Util;
-import com.founder.publicapi.util.DateUtil;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import com.founder.publicapi.vo.param.SkTrailParam;
 import com.founder.publicapi.vo.param.SkTrailSaveParam;
 import com.founder.publicapi.vo.response.SkTrailVO;

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

@@ -11,7 +11,7 @@ import com.founder.publicapi.logs.OperLog;
 import com.founder.publicapi.logs.OperationType;
 import com.founder.publicapi.service.SkDictionaryService;
 import com.founder.publicapi.service.SkRelatedResultService;
-import com.founder.publicapi.util.JsonUtil;
+import com.founder.commonutils.util.JsonUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SysDictitem;
 import com.founder.publicapi.service.SysDictitemService;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.SysGnsyrz;
 import com.founder.publicapi.service.SysGnsyrzService;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.TbStSjgj;
 import com.founder.publicapi.service.TbStSjgjService;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

service/publicapi/src/main/java/com/founder/publicapi/controller/asj/TbStAsjAsjbzController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.TbStAsjAsjbz;
 import com.founder.publicapi.service.TbStAsjAsjbzService;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

service/publicapi/src/main/java/com/founder/publicapi/controller/asj/TbStAsjController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.founder.publicapi.controller.SkDataUpload.ExcelControllerInterface;
 import com.founder.commonutils.newPublicEntity.TbStAsj;
 import com.founder.publicapi.service.TbStAsjService;
-import com.founder.publicapi.util.SpringUtil;
+import com.founder.commonutils.util.SpringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -10,7 +10,7 @@ import com.founder.commonutils.util.JwtUser;
 import com.founder.publicapi.service.SkServiceApplyService;
 import com.founder.publicapi.service.SkServiceService;
 import com.founder.publicapi.service.SysUserService;
-import com.founder.publicapi.util.ResultUtil;
+import com.founder.commonutils.util.ResultUtil;
 import io.jsonwebtoken.Claims;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -96,7 +96,7 @@ public class TokenInterceptor implements HandlerInterceptor {
             Claims claims = null;
             try {
                 System.out.println("authorization:"+thirdauthorization);
-                if (authorization == null || "".equals(authorization)) {
+                if (authorization == null || "".equals(authorization) || authorization.trim().equals("null")) {
                     Map<String, Object> map = getMap(401, "没有用户token信息");
                     ResultUtil.responseJson(response, map);
                     return false;

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

+package com.founder.publicapi.logs;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author jlt
+ * @date 2022/03/31/
+ */
+@Data
+public class LogCount {
+    /**
+     * 日期
+    */
+    private String date;
+    /**
+     * 登录次数
+    */
+    private Integer count;
+    /**
+     * 用户登录次数
+     */
+    private Integer user;
+
+    public LogCount(){}
+    public LogCount(String date,Integer count,Integer user){
+        this.date=date;
+        this.count=count;
+        this.user=user;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.founder.publicapi.logs;
 
 import cn.hutool.json.JSONObject;
 import com.founder.commonutils.Exception.TokenException;
+import com.founder.commonutils.newPublicEntity.SysUser;
 import com.founder.commonutils.util.JwtUser;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.newPublicEntity.ThirdToken;
@@ -32,6 +33,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.founder.commonutils.util.AesEncryptUtil.desEncrypt;
+
 /**
  * 系统日志：切面处理类
  * <p>
@@ -95,35 +98,44 @@ public class SysLogAspect {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
 
-        //获取token信息
-        Claims claims = null;
-        String thirdauthorization = JwtUser.getHeadToken(request, "thirdauthorization");
-        if (thirdauthorization != null && !"".equals(thirdauthorization)) {
-            try {
-                claims = new JwtUser().parseJWT(thirdauthorization);
-                String sub = (String) claims.get("sub");
-                JSONObject object = new JSONObject(sub);
-                ThirdToken token = new ThirdToken(object);
-                System.out.println("thirdToken===>"+token);
-                sysLog.setUserid(token.getGsNama());
-            } catch (TokenException e) {
-                sysLog.setUserid("system");
-            }
+        if (myLog != null && myLog.operation().equals("LOGIN")) {
+            SysUser user = (SysUser) map.get("user");
+            SimpleDateFormat ss = new SimpleDateFormat("yyyyMMdd");
+            String today = ss.format(new Date());
+            String KEY = "maplogin" + today;
+            String IV = "map_vues" + today;
+            String trim = desEncrypt(user.getUsername(), KEY, IV).trim();
+            sysLog.setUserid(trim);
         } else {
-            try {
-                String authorization = JwtUser.getHeadToken(request, "authorization");
-                claims = new JwtUser().parseJWT(authorization);
-                String sub = (String) claims.get("sub");
-                JSONObject object = new JSONObject(sub);
-                Token token = new Token(object);
-                System.out.println("token===>"+token);
-                sysLog.setUserid(token.getUsername());
-            } catch (
-                    TokenException e) {
-                sysLog.setUserid("system");
+            //获取token信息
+            Claims claims = null;
+            String thirdauthorization = JwtUser.getHeadToken(request, "thirdauthorization");
+            if (thirdauthorization != null && !"".equals(thirdauthorization)) {
+                try {
+                    claims = new JwtUser().parseJWT(thirdauthorization);
+                    String sub = (String) claims.get("sub");
+                    JSONObject object = new JSONObject(sub);
+                    ThirdToken token = new ThirdToken(object);
+                    System.out.println("thirdToken===>" + token);
+                    sysLog.setUserid(token.getGsNama());
+                } catch (TokenException e) {
+                    sysLog.setUserid("system");
+                }
+            } else {
+                try {
+                    String authorization = JwtUser.getHeadToken(request, "authorization");
+                    claims = new JwtUser().parseJWT(authorization);
+                    String sub = (String) claims.get("sub");
+                    JSONObject object = new JSONObject(sub);
+                    Token token = new Token(object);
+                    System.out.println("token===>" + token);
+                    sysLog.setUserid(token.getUsername());
+                } catch (
+                        TokenException e) {
+                    sysLog.setUserid("system");
+                }
             }
         }
-
         // 记录下请求内容
         LOG.info("URL : " + request.getRequestURL().
 
@@ -158,7 +170,7 @@ public class SysLogAspect {
         System.out.println("============================================2.请求开始：" + df.format(new
 
                 Date()) + "============================================");
-        System.out.println("URL===>"+request.getRequestURL());
+        System.out.println("URL===>" + request.getRequestURL());
         System.out.println("用户===>" + sysLog.getUserid());
         System.out.println("请求ip===>" + sysLog.getIp());
         System.out.println("请求的方法===>" + sysLog.getMessage());

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

@@ -4,11 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.publicEntity.MapRestResult;
+import com.founder.commonutils.util.DateUtil;
+import com.founder.commonutils.util.StringUtil;
 import com.founder.publicapi.logs.SkSysLog;
+import com.founder.publicapi.logs.param.LogCountParam;
 import com.founder.publicapi.logs.param.LogParam;
 import com.founder.publicapi.logs.service.SkSysLogService;
-import com.founder.publicapi.util.DateUtil;
-import com.founder.publicapi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -76,4 +77,9 @@ public class SkSysLogController {
     }
 
 
+    @PostMapping("countTotal")
+    public MapRestResult countTotal(@RequestBody LogCountParam param) throws ParseException {
+        return new MapRestResult(service.countTotal(param));
+    }
+
 }

service/publicapi/src/main/java/com/founder/publicapi/logs/mapper/SkSysLogMapper.java

 package com.founder.publicapi.logs.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.founder.publicapi.logs.LogCount;
 import com.founder.publicapi.logs.SkSysLog;
+import com.founder.publicapi.logs.param.LogCountParam;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 @Mapper
 public interface SkSysLogMapper extends BaseMapper<SkSysLog> {
+
+    public List<LogCount> countTotal(LogCountParam param);
+
+    LogCount countOne(@Param("date") String date);
 }

service/publicapi/src/main/java/com/founder/publicapi/logs/mapper/SkSysLogMapper.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.logs.mapper.SkSysLogMapper">
+
+
+    <select id="countTotal" resultType="com.founder.publicapi.logs.LogCount">
+        select date_format(createDate,'%Y-%m-%d') as date,COUNT(*) as count,COUNT(distinct userid)  as user
+        from sk_sys_log
+        where
+        operation='LOGIN' and content like '%status=200%'
+        <if test="startTime!=null and startTime!='' ">
+            and str_to_date(#{startTime},'%Y-%m-%d') <![CDATA[ <= ]]> date_format(createDate,'%Y-%m-%d')
+        </if>
+        <if test="endTime!=null and endTime!='' ">
+            and str_to_date(#{endTime},'%Y-%m-%d')<![CDATA[ >= ]]> date_format(createDate,'%Y-%m-%d')
+        </if>
+        group by date_format(createDate,'%Y-%m-%d') ORDER BY createDate ASC;
+    </select>
+
+    <select id="countOne" resultType="com.founder.publicapi.logs.LogCount">
+        select date_format(createDate,'%Y-%m-%d') as date,COUNT(*) as count,COUNT(distinct userid)  as user
+        from sk_sys_log
+        where
+            operation='LOGIN' and content like '%status=200%'
+        <if test="date!=null and date!='' ">
+            and str_to_date(#{date},'%Y-%m-%d') <![CDATA[ = ]]> date_format(createDate,'%Y-%m-%d')
+        </if>
+    </select>
+
+
+</mapper>

service/publicapi/src/main/java/com/founder/publicapi/logs/param/LogCountParam.java

+package com.founder.publicapi.logs.param;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author jlt
+ * @date 2022/03/31/
+ */
+@Data
+public class LogCountParam {
+    /**
+     * 开始时间
+    */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}

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

 package com.founder.publicapi.logs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.founder.publicapi.logs.LogCount;
 import com.founder.publicapi.logs.SkSysLog;
+import com.founder.publicapi.logs.param.LogCountParam;
 
-public interface SkSysLogService extends IService<SkSysLog> {
+import java.text.ParseException;
+import java.util.List;
 
+public interface SkSysLogService extends IService<SkSysLog> {
+    List<LogCount> countTotal(LogCountParam param) throws ParseException;
 }

service/publicapi/src/main/java/com/founder/publicapi/logs/service/impl/SkSysLogServiceImpl.java

 package com.founder.publicapi.logs.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.publicapi.logs.LogCount;
 import com.founder.publicapi.logs.SkSysLog;
 import com.founder.publicapi.logs.mapper.SkSysLogMapper;
+import com.founder.publicapi.logs.param.LogCountParam;
 import com.founder.publicapi.logs.service.SkSysLogService;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author jlt
  * @date 2022/03/04/
  */
 @Service
 public class SkSysLogServiceImpl extends ServiceImpl<SkSysLogMapper, SkSysLog> implements SkSysLogService {
+
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+    @Override
+    public List<LogCount> countTotal(LogCountParam param) throws ParseException {
+        List<LogCount> all=new ArrayList<>();
+        //计算时间
+        List<String> dateList = splitDateList(dateFormat.parse(param.getStartTime()), dateFormat.parse(param.getEndTime()));
+        for (String str:dateList) {
+            LogCount logCount = baseMapper.countOne(str);
+            logCount.setDate(str);
+            all.add(logCount==null?new LogCount(str,0,0):logCount);
+        }
+        return all;
+    }
+
+
+
+    /**
+     * 计算两个日期得时间差
+    */
+    public static List<String> splitDateList(Date startDate, Date endDate) {
+        List<String> listDate = new ArrayList<>();
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startDate);
+            while (calendar.getTime().before(endDate) || calendar.getTime().equals(endDate)) {
+                listDate.add(dateFormat.format(calendar.getTime()));
+                calendar.add(Calendar.DAY_OF_MONTH, 1);
+            }
+            return listDate;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return listDate;
+    }
+
+    public static void main(String[] args) throws ParseException {
+        List<String> list = splitDateList(dateFormat.parse("2022-03-25"),dateFormat.parse("2022-03-31 "));
+        for (String str:list) {
+            System.out.println(str);
+        }
+    }
+
 }
\ No newline at end of file

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

@@ -5,38 +5,39 @@
 
     <select id="count" resultType="java.lang.Integer">
         select count(distinct a.xxzjbh)
-        from sk_service_apply a,sk_service
+        from sk_service_apply a left join sk_service b on a.serviceId=b.xxzjbh
         where a.isDeleted='0'
         <if test="servicename!= null and servicename!=''">
-            AND serviceName= #{ servicename , jdbcType=VARCHAR }
+            AND serviceName like "%"#{ servicename , jdbcType=VARCHAR }"%"
         </if>
         <if test="servicems!= null and servicems!=''">
-            AND serviceMs= #{ servicems , jdbcType=VARCHAR }
+            AND serviceMs like  "%"#{ servicems , jdbcType=VARCHAR }"%"
         </if>
         <if test="applygs!= null and applygs!=''">
-            AND a.applyGs= #{ applygs , jdbcType=VARCHAR }
+            AND a.applyGs like "%"#{ applygs , jdbcType=VARCHAR }"%"
         </if>
-        <if test="ajlb!= null and ajlb!=''">
-            AND a.applyUrl= #{ applyurl , jdbcType=VARCHAR }
+        <if test="applyurl!= null and applyurl!=''">
+            AND a.applyUrl like "%"#{ 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'
+        from sk_service_apply a left join sk_service b on a.serviceId=b.xxzjbh
+        where a.isDeleted='0'
         <if test="servicename!= null and servicename!=''">
-            AND serviceName= #{ servicename , jdbcType=VARCHAR }
+            AND serviceName like "%"#{ servicename , jdbcType=VARCHAR }"%"
         </if>
         <if test="servicems!= null and servicems!=''">
-            AND serviceMs= #{ servicems , jdbcType=VARCHAR }
+            AND serviceMs like  "%"#{ servicems , jdbcType=VARCHAR }"%"
         </if>
         <if test="applygs!= null and applygs!=''">
-            AND a.applyGs= #{ applygs , jdbcType=VARCHAR }
+            AND a.applyGs like "%"#{ applygs , jdbcType=VARCHAR }"%"
         </if>
-        <if test="ajlb!= null and ajlb!=''">
-            AND a.applyUrl= #{ applyurl , jdbcType=VARCHAR }
+        <if test="applyurl!= null and applyurl!=''">
+            AND a.applyUrl like "%"#{ applyurl , jdbcType=VARCHAR }"%"
         </if>
         limit #{page},#{pageSize}
     </select>

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

@@ -6,9 +6,9 @@ import com.founder.commonutils.carEntity.TrackYstldResult;
 import com.founder.commonutils.carEntity.TrackYstldResultCountSort;
 import com.founder.commonutils.publicEntity.MapRestResult;
 import com.founder.commonutils.newPublicEntity.SkTrail;
+import com.founder.commonutils.util.DateUtil;
 import com.founder.publicapi.mapper.SkTrailMapper;
 import com.founder.publicapi.service.SkTrailService;
-import com.founder.publicapi.util.DateUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 

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

-package com.founder.publicapi.util;
-
-import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
-
-import java.io.IOException;
-
-/**
- * base64工具类
- * @author jlt
- * @date 2022/03/03/
- */
-public class Base64Util {
-
-    /**
-     * 图片转成base64字符串
-     */
-    public static String getBase64(MultipartFile imageFile) throws IOException {
-        BASE64Encoder base64Encoder =new BASE64Encoder();
-        String base64EncoderImg =base64Encoder.encode(imageFile.getBytes());
-        return base64EncoderImg;
-    }
-}

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

 package com.founder.publicapi.util;
 
 import com.founder.commonutils.util.KeyUtil;
+import com.founder.commonutils.util.SpringUtil;
 import com.founder.publicapi.service.SkDictionaryService;
-import com.founder.publicapi.service.SkRegionalsTaskService;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -18,7 +18,6 @@ import org.springframework.stereotype.Component;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -100,7 +99,7 @@ public class ExcelUtil {
 
                 int coloumNum = sheet.getRow(0).getPhysicalNumberOfCells();//获得总列数
                 int exportNum = getExportNum(fields);
-                if (className.equals("SkRegionalsResult")||className.equals("SkRegionalsTask")){//防止列数校验不正确
+                if (className.equals("SkRegionalsResult")||className.equals("SkRegionalsTask")||className.equals("SkRegionalsDetail")){//防止列数校验不正确
                     exportNum++;
                 }
                 if (coloumNum != fields.length - exportNum) {//添加列数检验，没主键，和判断标识
@@ -320,7 +319,7 @@ public class ExcelUtil {
                 HSSFRow row = sheet.getRow(i);
                 Class c = null;
                 try {
-                    c = Class.forName("com.founder.publicapi.entity." + className);
+                    c = Class.forName("com.founder.commonutils.newPublicEntity." + className);
                 } catch (Exception e) {
                     map.put("success", false);
                     map.put("error", "没有对应的模板，请仔细检查");
@@ -331,7 +330,7 @@ public class ExcelUtil {
 
                 int coloumNum = sheet.getRow(0).getPhysicalNumberOfCells();//获得总列数
                 int exportNum = getExportNum(fields);
-                if (className.equals("SkRegionalsResult")||className.equals("SkRegionalsTask")){//防止列数校验不正确
+                if (className.equals("SkRegionalsResult")||className.equals("SkRegionalsTask")||className.equals("SkRegionalsDetail")){//防止列数校验不正确
                     exportNum++;
                 }
                 if (coloumNum != fields.length - exportNum) {//添加列数检验，没主键，和判断标识
@@ -341,9 +340,7 @@ public class ExcelUtil {
                 }
 
                 fields[0].setAccessible(true);
-//                if (fields[0].getType().isInstance(1)) {//整形主键(使用自增)
-//                    fields[0].set(o, (int) (1 + Math.random() * 10000));
-//                } else {//字符串主键
+
                 if (fields[0].getType().isInstance("")) {
                     fields[0].set(o,KeyUtil.getUUIDKey(getXxzjbhName(className)));
                 }
@@ -437,7 +434,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

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

-package com.founder.publicapi.util;
-
-/**
- * @author jlt
- * @date 2022/03/17/
- */
-public class StringUtil {
-    public static boolean isEmpty(String str) {
-        if (str != null && !str.trim().isEmpty()) {
-            return false;// 不为空
-        }
-        return true;// 为空
-    }
-
-    public static String toUTF8(String str) {
-
-        if (isEmpty(str)) {
-            return "";
-        }
-        try {
-
-            if (str.equals(new String(str.getBytes("GB2312"), "GB2312"))) {
-
-                str = new String(str.getBytes("GB2312"), "utf-8");
-
-                return str;
-
-            }
-
-        } catch (Exception exception) {
-
-        }
-
-        try {
-
-            if (str.equals(new String(str.getBytes("ISO-8859-1"), "ISO-8859-1"))) {
-
-                str = new String(str.getBytes("ISO-8859-1"), "utf-8");
-
-                return str;
-
-            }
-
-        } catch (Exception exception1) {
-
-        }
-
-        try {
-
-            if (str.equals(new String(str.getBytes("GBK"), "GBK"))) {
-
-                str = new String(str.getBytes("GBK"), "utf-8");
-
-                return str;
-
-            }
-
-        } catch (Exception exception3) {
-
-        }
-
-        return str;
-
-    }
-}

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

@@ -3,7 +3,7 @@ package com.founder.publicapi.vo.response;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.founder.commonutils.newPublicEntity.SkServiceApply;
-import com.founder.publicapi.util.StringUtil;
+import com.founder.commonutils.util.StringUtil;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;