事前事后标记添加公司 工厂编码

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -15,6 +15,8 @@ import com.cn.esermis.dpld.model.OutletAndFactorVo;
 import com.cn.esermis.dpld.service.IAnalyticalInstrumentsService;
 import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import com.cn.esermis.dpld.service.IDetectMonitoringFactorService;
+import com.cn.esermis.model.BaseUser;
+import com.cn.esermis.utils.TokenUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -23,10 +25,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import java.util.*;
 
+import static com.cn.esermis.dpld.model.AjaxResult.error;
 import static com.cn.esermis.dpld.model.AjaxResult.success;
+import static com.cn.esermis.utils.TokenUtils.extractToken;
 
 @RestController
 @RequestMapping("/data_Acquisition")
@@ -43,10 +48,12 @@ public class DataAcquisitionInstrumentController {
      * 获取数采仪信息表
      */
     @GetMapping("/list")
-    public AjaxResult list(DataAcquisitionInstrumentVo vo)
+    public AjaxResult list(DataAcquisitionInstrumentVo vo, HttpServletRequest request)
     {
         IPage<DataAcquisitionInstrument> page = new Page<>(vo.getPageNum(), vo.getPageSize());
         QueryWrapper<DataAcquisitionInstrument> wrapper = new QueryWrapper<>();
+        BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
+//        wrapper.eq("company_code",userInfo.getCompanyId());
         wrapper.orderByDesc("department_code");
         IPage<DataAcquisitionInstrument> pageList = dataAcquisitionInstrumentService.page(page, wrapper);
         IPage<DataAcquisitionInstrumentVo> volits = new Page<>();
@@ -231,11 +238,15 @@ public class DataAcquisitionInstrumentController {
      * 获取数采仪信息表
      */
     @GetMapping("/listByCode")
-    public AjaxResult listByCode(DataAcquisitionInstrumentVo vo)
+    public AjaxResult listByCode(HttpServletRequest  request)
     {
         QueryWrapper<DataAcquisitionInstrument> wrapper = new QueryWrapper<>();
-        wrapper.eq(vo.getDepartmentCode()!=null,"department_code", vo.getDepartmentCode());
-//        wrapper.eq(vo.getCompanyCode()!=null,"company_code", vo.getCompanyCode());
+        BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
+        if (userInfo==null){
+            return error("无数据");
+        }
+        wrapper.eq(userInfo.getCompanyId()!=null,"department_code", userInfo.getCompanyId());
+        wrapper.eq(userInfo.getFactoryId()!=null,"company_code", userInfo.getFactoryId());
 //        List<DataAcquisitionInstrument> dataAcquisitionInstruments = dataAcquisitionInstrumentService.listByCode(vo);
         List<DataAcquisitionInstrument> dataAcquisitionInstruments = dataAcquisitionInstrumentService.list(wrapper);
         return success(dataAcquisitionInstruments);

src/main/java/com/cn/esermis/controller/PreMarkingController.java

@@ -4,17 +4,23 @@ import com.alibaba.fastjson2.JSON;
 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.cn.esermis.dpld.entity.DataAcquisitionInstrument;
 import com.cn.esermis.dpld.entity.PreMarking;
 import com.cn.esermis.dpld.model.AjaxResult;
 import com.cn.esermis.dpld.model.PreMarkingVo;
 import com.cn.esermis.dpld.service.IPreMarkingService;
+import com.cn.esermis.model.BaseUser;
+import com.cn.esermis.utils.TokenUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
+import static com.cn.esermis.utils.TokenUtils.extractToken;
+
 @RestController
 @RequestMapping("/pre_marking")
 public class PreMarkingController {
@@ -26,7 +32,11 @@ public class PreMarkingController {
     private IPreMarkingService preMarkingService;
 
     @PostMapping("/add")
-    public Object add(@RequestBody PreMarking preMarking) {
+    public Object add(@RequestBody PreMarking preMarking, HttpServletRequest request) {
+        BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
+        assert userInfo != null;
+        preMarking.setCompanyCode(userInfo.getCompanyId());
+        preMarking.setDepartmentCode(userInfo.getFactoryId());
         preMarkingService.save(preMarking);
         sendMessage();
         return AjaxResult.success("success");
@@ -40,7 +50,11 @@ public class PreMarkingController {
     }
 
     @PostMapping("/edit")
-    public Object edit(@RequestBody PreMarking preMarking) {
+    public Object edit(@RequestBody PreMarking preMarking, HttpServletRequest request) {
+        BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
+        assert userInfo != null;
+        preMarking.setCompanyCode(userInfo.getCompanyId());
+        preMarking.setDepartmentCode(userInfo.getFactoryId());
         preMarkingService.updateById(preMarking);
         sendMessage();
         return AjaxResult.success("success");

src/main/java/com/cn/esermis/dpld/business/MonitorBusiness.java

@@ -493,6 +493,9 @@ public class MonitorBusiness {
             postMarking.setOutletName(first.get().getOutletName());
             postMarking.setOutletNumber(first.get().getOutletCode());
             postMarking.setManagementNumber(String.valueOf(UuidUtil.getTimeBasedUuid()));
+            postMarking.setMnCode(first.get().getMnCode());
+            postMarking.setCompanyCode(first.get().getCompanyCode());
+            postMarking.setDepartmentCode(first.get().getDepartmentCode());
             switch (dataType){
                 case "1":
                     //判断是否为负值数据

src/main/java/com/cn/esermis/dpld/entity/PostMarking.java

@@ -70,5 +70,14 @@ public class PostMarking {
      */
     @TableField(value = "management_reasons")
     private String managementReasons;
+    /**
+     * mn好
+     */
+    @TableField(value = "mn_code")
+    private String mnCode;
+    @TableField(value = "company_code")
+    private String companyCode;
+    @TableField(value = "department_code")
+    private String departmentCode;
 
 }

src/main/java/com/cn/esermis/dpld/entity/PreMarking.java

@@ -80,4 +80,10 @@ public class PreMarking {
     private Date createTime;
 
 
+
+    @TableField(value = "company_code")
+    private String companyCode;
+    @TableField(value = "department_code")
+    private String departmentCode;
+
 }

src/main/java/com/cn/esermis/dpld/model/OutletAndFactorVo.java

@@ -19,6 +19,11 @@ public class OutletAndFactorVo {
 
 
     private String factor;
+    private String mnCode;
+    private String companyCode;
+    private String departmentCode;
+
+
 
 
 }

src/main/java/com/cn/esermis/utils/TokenUtils.java

@@ -5,8 +5,13 @@ import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.cn.esermis.model.BaseUser;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class TokenUtils {
 
+    private static final String AUTH_HEADER = "Authorization";
+    private static final String TOKEN_PREFIX = "Bearer ";
+
     public static BaseUser getUserInfo(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);
@@ -20,6 +25,15 @@ public class TokenUtils {
         }
     }
 
+
+    public static String extractToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader(AUTH_HEADER);
+        if (bearerToken != null && bearerToken.startsWith(TOKEN_PREFIX)) {
+            return bearerToken.substring(TOKEN_PREFIX.length());
+        }
+        return null;
+    }
+
     public static void main(String[] args) {
         System.out.println(getUserInfo("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjb21wYW55SWQiOiIxMDAwMDAwMDEiLCJpc3MiOiJhdXRoMCIsImV4cCI6MTcyODYxMTk5NywidXNlcklkIjoiMTEwMDAwMTk3MTAxMDEwMDAwIn0.ZlKMmrDKQiU1PTxseg0qCu5Bb2LwZryBr72C9XxWpHs"));
     }

src/main/resources/static/mybatis/DataAcquisitionInstrumentMapper.xml

@@ -5,7 +5,12 @@
 <mapper namespace="com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper">
 
     <select id="selectListAll" resultType="com.cn.esermis.dpld.model.OutletAndFactorVo">
-        select a.outlet_name `outletName`,a.outlet_code outletCode,c.factor factor
+        select a.outlet_name `outletName`,
+               a.outlet_code outletCode,
+               c.factor `factor`,
+               a.mn_code `mnCode`,
+               a.company_code `companyCode`,
+               a.department_code `departmentCode`
         from data_acquisition_instrument a
                  left join analytical_instruments b on a.id = b.data_acquisition_instrument_id
                  left join monitoring_factor c on b.id = c.analytical_instrument_id