4/18 后台管理登录，受理工单

src/main/java/com/example/xiaoshiweixinback/business/common/Response.java

@@ -108,6 +108,13 @@ public class Response {
         return JsonUtils.objectToJson(response);
     }
 
+    public static Response error(String code,String message) {
+       Integer erCode= Integer.parseInt(code);
+        Response response = new Response();
+        response.setCode(erCode);
+        response.setMessage(message);
+        return response;
+    }
     public Response(Integer code, String message) {
         this.code = code;
         this.message = message;

src/main/java/com/example/xiaoshiweixinback/business/common/ResponseEnum.java

@@ -18,7 +18,9 @@ public enum ResponseEnum {
     PATENT_EXPORT_TASK(602,"导出专利信息"),
     PATENT_EXPORT_TASK_DONE(603,"导出专利信息完成"),
     PATENT_PDF_EXPORT_TASK(604,"导出PDF首页"),
-    PATENT_PDF_EXPORT_TASK_DONE(605,"导出PDF首页完成");
+    PATENT_PDF_EXPORT_TASK_DONE(605,"导出PDF首页完成"),
+    LOGIN_ERROR(606,"登录错误"),
+    BUSINESS_ERROR(607,"业务错误");
 
     private Integer code;
     private String message;

src/main/java/com/example/xiaoshiweixinback/business/redis/RedisService.java

@@ -479,11 +479,14 @@ public class RedisService {
     }
 
     /**
-     * 获取指定 key 的值
-     *
+     * 设置键值并且过期时间是午夜
      * @param key
-     * @return
+     * @param value
      */
+    public  void setKeyLastToMidNight(String key ,String value){
+       Long second= DateUtil.getRemainingSecond();
+        redisTemplate.opsForValue().set(key, value, second, TimeUnit.SECONDS);
+    }
 }
 
 

src/main/java/com/example/xiaoshiweixinback/business/utils/LoginUtils.java

@@ -18,7 +18,7 @@ public class LoginUtils {
         RequestAttributes ra = RequestContextHolder.getRequestAttributes();
         ServletRequestAttributes sra = (ServletRequestAttributes) ra;
         HttpServletRequest httpRequest = sra.getRequest();
-        String tem = httpRequest.getHeader("Cookie");
+        String tem = httpRequest.getHeader("Authorization");
         return tem;
 //        List<String> lst = StringUtils.changeStringToString(tem, ";");
 //        final String[] token = {null};

src/main/java/com/example/xiaoshiweixinback/controller/LoginController.java

@@ -3,6 +3,7 @@ package com.example.xiaoshiweixinback.controller;
 
 import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
+import com.example.xiaoshiweixinback.business.exception.BusinessException;
 import com.example.xiaoshiweixinback.entity.dto.person.*;
 import com.example.xiaoshiweixinback.entity.vo.person.LoginByWxVO;
 import com.example.xiaoshiweixinback.entity.vo.person.LoginVO;
@@ -107,4 +108,18 @@ public class LoginController {
     public Response logout(PersonIdDTO dto) {
         return Response.success(loginService.logout(dto));
     }
+
+
+    @Operation(summary = "手机号/账号登录")
+    @PostMapping(value = "/loginByAccount")
+    public Response loginByAccount(@Valid @RequestBody LoginDTO vo) {
+        LoginVO loginVO = null;
+        try {
+            loginVO = loginService.loginByAccount(vo);
+        } catch (BusinessException e) {
+            return Response.error(e.getErrorCode(),e.getMessage());
+        }
+        return Response.success(loginVO);
+    }
+
 }

src/main/java/com/example/xiaoshiweixinback/controller/PatentController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
 import com.example.xiaoshiweixinback.business.common.base.Records;
+import com.example.xiaoshiweixinback.business.exception.BusinessException;
 import com.example.xiaoshiweixinback.business.utils.FileUtils;
 import com.example.xiaoshiweixinback.checkLogin.checkLogin;
 import com.example.xiaoshiweixinback.entity.dto.esPicture.EsPictureNoDTO;
@@ -84,7 +85,13 @@ public class PatentController {
         if (StringUtils.isNotEmpty(vectorDTO)) {
             esPatentVectorDTO = JSONObject.parseObject(vectorDTO, EsPatentVectorDTO.class);
         }
-        Records records = esDenseVectorService.getPatentVectors(esPatentVectorDTO, file);
+        Records records = null;
+        try {
+           records = esDenseVectorService.getPatentVectors(esPatentVectorDTO, file);
+        }
+ catch (BusinessException e){
+            return  Response.error(e.getErrorCode(),e.getMessage());
+ }
         return Response.success(records);
     }
 

src/main/java/com/example/xiaoshiweixinback/controller/TicketController.java

@@ -5,6 +5,7 @@ import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
 import com.example.xiaoshiweixinback.business.common.base.Records;
 import com.example.xiaoshiweixinback.checkLogin.checkLogin;
+import com.example.xiaoshiweixinback.entity.dto.ticket.AcceptTicketDTO;
 import com.example.xiaoshiweixinback.entity.dto.ticket.TicketProcessUpDTO;
 import com.example.xiaoshiweixinback.entity.dto.ticket.TicketQueryDTO;
 import com.example.xiaoshiweixinback.entity.product.ProductDTO;
@@ -58,8 +59,19 @@ public class TicketController {
 
     @Operation(summary = "查询工单")
     @PostMapping("/queryTicket")
+    @checkLogin
     public Response queryTicket(@RequestBody TicketQueryDTO ticketQueryDTO) {
         Records records = ticketService.queryTickets(ticketQueryDTO);
         return Response.success(records);
     }
+
+    @Operation(summary = "受理工单")
+    @PostMapping("/acceptTicket")
+    @checkLogin
+    public Response acceptTicket(@RequestBody AcceptTicketDTO acceptTicketDTO) {
+        Integer id = ticketService.acceptTicket(acceptTicketDTO);
+        Records records = new Records();
+        records.setData(id);
+        return Response.success(records);
+    }
 }

src/main/java/com/example/xiaoshiweixinback/domain/TicketFlow.java

@@ -0,0 +1,39 @@
+package com.example.xiaoshiweixinback.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 工单流程
+ * @TableName ticket_flow
+ */
+@TableName(value ="ticket_flow")
+@Data
+public class TicketFlow extends BaseEntity<TicketFlow>  {
+    /**
+     * ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 
+     */
+    private String createId;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+}

src/main/java/com/example/xiaoshiweixinback/entity/dto/ticket/AcceptTicketDTO.java

@@ -0,0 +1,11 @@
+package com.example.xiaoshiweixinback.entity.dto.ticket;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AcceptTicketDTO {
+ private Integer id;
+ private Double price;
+}

src/main/java/com/example/xiaoshiweixinback/mapper/TicketFlowMapper.java

@@ -0,0 +1,18 @@
+package com.example.xiaoshiweixinback.mapper;
+
+import com.example.xiaoshiweixinback.domain.TicketFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author admin
+* @description 针对表【ticket_flow(工单流程)】的数据库操作Mapper
+* @createDate 2024-04-17 18:47:48
+* @Entity xiaoshiweixinback.domain.TicketFlow
+*/
+public interface TicketFlowMapper extends BaseMapper<TicketFlow> {
+
+}
+
+
+
+

src/main/java/com/example/xiaoshiweixinback/service/AssoPersonFunctionService.java

@@ -1,57 +1,109 @@
 package com.example.xiaoshiweixinback.service;
 
+import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.xiaoshiweixinback.business.common.base.RedisConf;
+import com.example.xiaoshiweixinback.business.exception.BusinessException;
 import com.example.xiaoshiweixinback.business.redis.RedisService;
+import com.example.xiaoshiweixinback.business.utils.*;
 import com.example.xiaoshiweixinback.domain.AssoPersonFunction;
 
 import com.example.xiaoshiweixinback.domain.AssoPersonVip;
 import com.example.xiaoshiweixinback.domain.AssoVipFunction;
 import com.example.xiaoshiweixinback.domain.Vip;
+import com.example.xiaoshiweixinback.entity.sysFuctionRights.FunctionConfig;
+import com.example.xiaoshiweixinback.entity.vo.PersonnelVO;
 import com.example.xiaoshiweixinback.mapper.AssoPersonFunctionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
-* @author admin
-* @description 针对表【asso_person_function(人员功能关联表)】的数据库操作Service实现
-* @createDate 2024-04-10 23:08:39
-*/
+ * @author admin
+ * @description 针对表【asso_person_function(人员功能关联表)】的数据库操作Service实现
+ * @createDate 2024-04-10 23:08:39
+ */
 @Service
 public class AssoPersonFunctionService extends ServiceImpl<AssoPersonFunctionMapper, AssoPersonFunction> {
-@Autowired
-private RedisService redisService;
-@Autowired
-private VipService vipService;
-@Autowired
-private AssoVipFunctionService assoVipFunctionService;
-    public void get(String functionUuid){
-        String personUuid ="";
-        String redisKey =RedisConf.PERSON_FUNCTION+RedisConf.SYMBOL_COLON+personUuid+RedisConf.SYMBOL_COLON+functionUuid;
-      Object o =redisService.get(redisKey);
-      if(o==null){
-          AssoPersonFunction assoPersonFunction = vipService.getAssoPersonFunction(functionUuid);
-          if(assoPersonFunction==null){
-          Vip vip =vipService.getDefaultVip();
-              AssoVipFunction assoVipFunction =   assoVipFunctionService.getByVipUuidAndFunId(vip.getVipUuid(),personUuid);
-         if(assoVipFunction!=null){}
-
-          }
-      }
+    @Autowired
+    private RedisService redisService;
+    @Autowired
+    private VipService vipService;
+    @Autowired
+    private AssoVipFunctionService assoVipFunctionService;
+    @Autowired
+    private CacheUtil cacheUtil;
 
-    }
+    @Transactional(rollbackFor = Exception.class)
+    public FunctionConfig getFunctionConfig(String functionUuid) {
+        PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
+        String personUuid = personnelVO.getUuid();
+        //从redis里取出功能
+        String redisKey = RedisConf.PERSON_FUNCTION + RedisConf.SYMBOL_COLON + personUuid + RedisConf.SYMBOL_COLON + functionUuid;
+        Object o = redisService.get(redisKey);
+        FunctionConfig functionConfig = null;
+
+        //若redis取出为空
+        if (o == null) {
+
+            //取出人员和功能关联
+            AssoPersonFunction assoPersonFunction = vipService.getAssoPersonFunction(functionUuid);
 
+            //若人员和功能没有关联则取出和默认会员关联的功能
+            if (assoPersonFunction == null) {
+                Vip vip = vipService.getDefaultVip();
+                AssoVipFunction assoVipFunction = assoVipFunctionService.getByVipUuidAndFunId(vip.getVipUuid(), functionUuid);
+                if (assoVipFunction != null) {
+                    Date createDate = new Date();
+                    Date expiryDate = DateUtils.getPlusMonthDate(createDate, vip.getLastTime());
+                    assoPersonFunction = new AssoPersonFunction();
+                    assoPersonFunction.setFunctionUuid(functionUuid);
+                    assoPersonFunction.setExpiryTime(expiryDate);
+                    assoPersonFunction.setCreateTime(createDate);
+                    assoPersonFunction.setFunctionParameter(assoVipFunction.getFunctionParameter());
+                    assoPersonFunction.setVipType(vip.getVipType());
+                    assoPersonFunction.setVipUuid(vip.getVipUuid());
+                    assoPersonFunction.setPersonUuid(personUuid);
+                    assoPersonFunction.insert();
+                }
+            }
+            //设置键值
+            if (assoPersonFunction != null) {
+                redisService.setKeyLastToMidNight(redisKey, assoPersonFunction.getFunctionParameter());
+            }
+            functionConfig = JSON.parseObject(assoPersonFunction.getFunctionParameter(), FunctionConfig.class);
+
+        }
+        else {
+            functionConfig = JSON.parseObject(String.valueOf(o), FunctionConfig.class);
+        }
+        if (functionConfig == null) {
+            throw new BusinessException("402", "无权限");
+        } else {
+            if (functionConfig.getCanGetNum() == 0) {
+                throw new BusinessException("402", "超过可使用次数");
+            }
+        }
+        return functionConfig;
+    }
 
 
+    public void subFunctionCount(FunctionConfig functionConfig, String functionUuid) {
+        PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
+        String personUuid = personnelVO.getUuid();
+        functionConfig.setCanGetNum(functionConfig.getCanGetNum() - 1);
+        String redisKey = RedisConf.PERSON_FUNCTION + RedisConf.SYMBOL_COLON + personUuid + RedisConf.SYMBOL_COLON + functionUuid;
 
-    public  void addDefault() {
-        //获得
-        Vip vip = vipService.getDefaultVip();
-        List<AssoVipFunction> assoVipFunctions = assoVipFunctionService.getVipFunctionByVipUuid(vip.getVipUuid());
+        redisService.setKeyLastToMidNight(redisKey, JsonUtils.objectToJson(functionConfig));
 
     }
+
 }
 
 

src/main/java/com/example/xiaoshiweixinback/service/LoginService.java

@@ -76,8 +76,11 @@ public class LoginService {
     private CacheUtil cacheUtil;
     @Autowired
     private VipService vipService;
-@Autowired
-private AssoPersonVipMapper assoPersonVipMapper;
+    @Autowired
+    private AssoPersonVipMapper assoPersonVipMapper;
+    @Autowired
+    private PersonService personService;
+
     /**
      * 手机号/账号登录
      *
@@ -275,7 +278,7 @@ private AssoPersonVipMapper assoPersonVipMapper;
         Person person = personMapper.selectById(personnelVO.getId());
         PersonVO personVO = new PersonVO();
         BeanUtil.copy(person, personVO);
-      VipMessageVO vipMessageVO= assoPersonVipMapper.getByPerson(person.getUuid());
+        VipMessageVO vipMessageVO = assoPersonVipMapper.getByPerson(person.getUuid());
         personVO.setVip(vipMessageVO);
         return personVO;
     }
@@ -406,4 +409,47 @@ private AssoPersonVipMapper assoPersonVipMapper;
         }
         return null;
     }
+
+
+    /**
+     * 账号密码登录
+     *
+     * @param dto
+     * @return
+     */
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+    public LoginVO loginByAccount(LoginDTO dto) throws BusinessException {
+        LoginVO loginVO = new LoginVO();
+        String account = dto.getAccount();
+        String password = dto.getPassword();
+        LambdaQueryWrapper<Person> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Person::getPhoneNum, account).or().eq(Person::getUserName, account)
+                .or().eq(Person::getEmail, account);
+        Person person = personService.getOne(queryWrapper, false);
+        if(person==null){
+        throw new BusinessException("606","账号错误");
+        }
+        if(person.getUserPassword()==null){
+            throw new BusinessException("606","非账号登录用户");
+        }
+        if (!person.getUserPassword().equals(password)) {
+             throw new BusinessException("606","密码错误");
+        }
+
+        //将用户信息数据存入Redis
+        PersonnelVO personnelVO = new PersonnelVO();
+        BeanUtil.copy(person, personnelVO);
+        String token="";
+        try {
+            token = jwtTokenUtil.createToken();
+
+        }
+        catch (Exception e){
+            throw new BusinessException("606","生成token错误");
+        }
+        BeanUtil.copy(person,loginVO);
+        loginVO.setToken(token);
+        cacheUtil.setLoginUser(personnelVO, token);
+        return loginVO;
+    }
 }

src/main/java/com/example/xiaoshiweixinback/service/TicketFlowService.java

@@ -0,0 +1,20 @@
+package com.example.xiaoshiweixinback.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.domain.TicketFlow;
+import com.example.xiaoshiweixinback.mapper.TicketFlowMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author admin
+* @description 针对表【ticket_flow(工单流程)】的数据库操作Service实现
+* @createDate 2024-04-17 18:47:48
+*/
+@Service
+public class TicketFlowService extends ServiceImpl<TicketFlowMapper, TicketFlow> {
+
+}
+
+
+
+

src/main/java/com/example/xiaoshiweixinback/service/TicketService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.xiaoshiweixinback.business.common.base.Records;
+import com.example.xiaoshiweixinback.business.exception.BusinessException;
 import com.example.xiaoshiweixinback.business.utils.BatchNoUtil;
 import com.example.xiaoshiweixinback.business.utils.CacheUtil;
 import com.example.xiaoshiweixinback.business.utils.LoginUtils;
@@ -249,10 +250,10 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Integer updateProcess(String uuid,Integer process) {
-        LambdaQueryWrapper<Ticket> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(Ticket::getNum,uuid);
-        Ticket ticket =this.getOne(queryWrapper,false);
+    public Integer updateProcess(String uuid, Integer process) {
+        LambdaQueryWrapper<Ticket> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Ticket::getNum, uuid);
+        Ticket ticket = this.getOne(queryWrapper, false);
         ticket.setTicketProgress(process);
         ticket.updateById();
         return ticket.getId();
@@ -274,7 +275,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         if (!flag) {
             return 0;
         }
-        String ps=""+price*100;
+        String ps = "" + price * 100;
         ticket.setPrice(Integer.parseInt(ps));
         ticket.updateById();
         return ticket.getId();
@@ -290,13 +291,33 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
     }
 
 
-    public Ticket getTicketByUUid(String uuid){
-        LambdaQueryWrapper<Ticket> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(Ticket::getNum,uuid);
-        Ticket ticket =this.getOne(queryWrapper);
+    public Ticket getTicketByUUid(String uuid) {
+        LambdaQueryWrapper<Ticket> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Ticket::getNum, uuid);
+        Ticket ticket = this.getOne(queryWrapper);
         return ticket;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public Integer acceptTicket(AcceptTicketDTO acceptTicketDTO) {
+       Integer id =acceptTicketDTO.getId();
+       Double price=acceptTicketDTO.getPrice();
+      //根据id查询工单
+        Ticket ticket =this.getById(id);
+        if(ticket==null){
+            throw new BusinessException("607","未查询到工单");
+        }
+       if(ticket.getTicketProgress()>2){
+           throw new BusinessException("607","此工单不可进行操作");
+       }
+       Double truePrice =price*100;
+       Integer iPrice =truePrice.intValue();
+       ticket.setPrice(iPrice);
+       ticket.setTicketProgress(2);
+       ticket.updateById();
+       return ticket.getId();
+    }
+
 }
 
 

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsDenseVectorService.java

@@ -17,7 +17,6 @@ import com.example.xiaoshiweixinback.business.common.base.Records;
 import com.example.xiaoshiweixinback.business.common.base.RedisConf;
 import com.example.xiaoshiweixinback.business.redis.RedisService;
 import com.example.xiaoshiweixinback.business.utils.BeanUtil;
-import com.example.xiaoshiweixinback.business.utils.JSONUtil;
 import com.example.xiaoshiweixinback.business.utils.RegexUtil;
 import com.example.xiaoshiweixinback.business.utils.parseQueryToTree.expressManager;
 import com.example.xiaoshiweixinback.business.utils.parseQueryToTree.operateNode;
@@ -29,7 +28,6 @@ import com.example.xiaoshiweixinback.entity.dto.esPicture.EsPictureNoDTO;
 import com.example.xiaoshiweixinback.entity.dto.esPicture.EsPatentVectorDTO;
 import com.example.xiaoshiweixinback.entity.dto.patent.PatentColumnDTO;
 import com.example.xiaoshiweixinback.entity.dto.searchRecord.AddSearchRecordDTO;
-import com.example.xiaoshiweixinback.entity.dto.searchRecord.SearchRecordConditionDTO;
 import com.example.xiaoshiweixinback.entity.vo.esPicture.EsPictureNoVo;
 import com.example.xiaoshiweixinback.entity.vo.esPicture.EsPatentVectorVo;
 import com.example.xiaoshiweixinback.mapper.ProductMapper;
@@ -194,11 +192,13 @@ public class EsDenseVectorService {
         if (Boolean.TRUE.equals(ifAddSearchRecord)) {
             //添加检索历史
             AddSearchRecordDTO recordDTO = new AddSearchRecordDTO();
-            SearchRecordConditionDTO conditionDTO = new SearchRecordConditionDTO();
-            conditionDTO.setKey(dto.getKey());
-            conditionDTO.setCompanyName(dto.getCompanyName());
-            conditionDTO.setAppCountry(dto.getAppCountry());
-            recordDTO.setSearchCondition(JSONUtil.toJSONString(conditionDTO));
+            if (dto.getProductId() != null) {
+                recordDTO.setProductId(dto.getProductId());
+                Product product = productMapper.selectById(dto.getProductId());
+                recordDTO.setSearchCondition(product.getName());
+            } else {
+                recordDTO.setSearchCondition(dto.getKey());
+            }
             recordDTO.setDescription(dto.getDescription());
             if (!CollectionUtils.isEmpty(getGuids)) {
                 recordDTO.setGuid(getGuids.get(0));
@@ -267,11 +267,10 @@ public class EsDenseVectorService {
             searchCondition = searchCondition + " AND " + "AD = " + "(" + s + ")";
         }
         if (StringUtils.isNotEmpty(appCountry)) {
-            String s = this.appendStr(appCountry);
             if (StringUtils.isEmpty(searchCondition)) {
-                searchCondition = "CO = " + "(" + s + ")";
+                searchCondition = "CO = " + "(" + appCountry + ")";
             } else {
-                searchCondition = searchCondition + " AND " + "CO = " + "(" + s + ")";
+                searchCondition = searchCondition + " AND " + "CO = " + "(" + appCountry + ")";
             }
         }
         if (StringUtils.isNotEmpty(companyName)) {