瀏覽代碼

广告屏列表

zhj 2 年之前
父節點
當前提交
10fae02a17
共有 22 個文件被更改,包括 668 次插入3 次删除
  1. 1 0
      src/main/java/com/welampiot/common/InterfaceResultEnum.java
  2. 15 1
      src/main/java/com/welampiot/controller/NewLampPoleController.java
  3. 140 2
      src/main/java/com/welampiot/controller/ScreenController.java
  4. 16 0
      src/main/java/com/welampiot/dao/ProReviewerDao.java
  5. 19 0
      src/main/java/com/welampiot/dao/ScreenOpenModeDao.java
  6. 1 0
      src/main/java/com/welampiot/dao/UserDao.java
  7. 10 0
      src/main/java/com/welampiot/dto/ProReviewerDTO.java
  8. 24 0
      src/main/java/com/welampiot/dto/ScreenModeContentDTO.java
  9. 21 0
      src/main/java/com/welampiot/dto/ScreenModeValueDTO.java
  10. 55 0
      src/main/java/com/welampiot/dto/ScreenOpenModeDTO.java
  11. 17 0
      src/main/java/com/welampiot/service/ProReviewerService.java
  12. 18 0
      src/main/java/com/welampiot/service/ScreenOpenModeService.java
  13. 1 0
      src/main/java/com/welampiot/service/UserService.java
  14. 34 0
      src/main/java/com/welampiot/service/impl/ProReviewerServiceImpl.java
  15. 29 0
      src/main/java/com/welampiot/service/impl/ScreenOpenModeServiceImpl.java
  16. 5 0
      src/main/java/com/welampiot/service/impl/UserServiceImpl.java
  17. 68 0
      src/main/java/com/welampiot/vo/ProReviewerDetailsVO.java
  18. 61 0
      src/main/java/com/welampiot/vo/ProReviewerVO.java
  19. 40 0
      src/main/java/com/welampiot/vo/ScreenOpenModeVO.java
  20. 65 0
      src/main/resources/mapper/ProReviewerMapper.xml
  21. 22 0
      src/main/resources/mapper/ScreenOpenModeMapper.xml
  22. 6 0
      src/main/resources/mapper/UserMapper.xml

+ 1 - 0
src/main/java/com/welampiot/common/InterfaceResultEnum.java

@@ -153,6 +153,7 @@ public enum InterfaceResultEnum {
     STRIP_GROUP_NUMBER_UNIQUE_ERROR("0343","灯带分组编号已存在","The strip group number already exists","Номера ламп уже существуют"),
     WATER_LEVEL_NAME_UNIQUE_ERROR("0344","液位传感器名称已存在","The liquid level sensor name already exists","Имя жидкого датчика уже существует"),
     WATER_LEVEL_NUMBER_UNIQUE_ERROR("0345","液位传感器编号已存在","The liquid level sensor number exists","Номер жидкого датчика уже существует"),
+    PRO_REVIEWER_STATUS_ERROR("0346","已审核,无法重复操作","Reviewed, cannot be repeated","Повторная операция невозможна"),
     ;
     private String code;
     private String msgCn;

+ 15 - 1
src/main/java/com/welampiot/controller/NewLampPoleController.java

@@ -14,8 +14,9 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import java.io.File;
+
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1471,4 +1472,17 @@ public class NewLampPoleController {
         programVO.setVideoList(videoList);
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,programVO);
     }
+
+    /**
+     * 审核人员列表
+     * @return 审核人员列表
+     */
+    @RequestMapping(value = "/reviewerList", method = RequestMethod.POST)
+    public BaseResult<?> reviewerList(HttpServletRequest request) {
+        Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
+        List<UserDTO> reviewerList = userService.getReviewerList();
+        UserVO userVO = new UserVO();
+        userVO.setList(reviewerList);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,userVO);
+    }
 }

+ 140 - 2
src/main/java/com/welampiot/controller/ScreenController.java

@@ -6,8 +6,8 @@ import com.welampiot.dto.*;
 import com.welampiot.service.*;
 import com.welampiot.utils.SHH2Util;
 import com.welampiot.utils.ToolUtils;
-import com.welampiot.vo.ProgramVO;
-import com.welampiot.vo.ScreenVO;
+import com.welampiot.vo.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,6 +52,12 @@ public class ScreenController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private ProReviewerService proReviewerService;
+
+    @Autowired
+    private ScreenOpenModeService screenOpenModeService;
+
     /**
      * 获取屏幕下拉列表
      * @param request
@@ -179,4 +185,136 @@ public class ScreenController {
         }
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
+
+    /**
+     * 审核信息列表
+     * @param vo status,page,count
+     * @return 审核信息列表
+     */
+    @RequestMapping(value = "/proReviewer", method = RequestMethod.POST)
+    public BaseResult<?> proReviewer(ProReviewerVO vo) {
+        ProReviewerVO proReviewerVO = ProReviewerVO.getFaultProReviewerVO(vo);
+        Integer version = vo.getVersion();
+        String username = proReviewerVO.getUsername();
+        UserDTO userDTO = userService.queryUserIdByUsername(username);
+        if (userDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        proReviewerVO.setUserid(userDTO.getId());
+        List<ProReviewerDTO> proReviewerList = proReviewerService.getProReviewerListByVO(proReviewerVO);
+        proReviewerList.forEach(dto -> {
+            if (dto.getStatus() == 0 && dto.getReviewer().equals(userDTO.getId())) {
+                dto.setIsShow(1);
+            } else {
+                dto.setIsShow(0);
+            }
+        });
+        ProReviewerVO proReviewerVO1 = new ProReviewerVO();
+        Integer proReviewCount = proReviewerService.getProReviewCount(userDTO.getId());
+        Integer readProReviewCount = proReviewerService.getReadProReviewCount(userDTO.getId());
+        Integer unReadProReviewCount = proReviewerService.getUnReadProReviewCount(userDTO.getId());
+        proReviewerVO1.setTotal(proReviewCount);
+        proReviewerVO1.setTotal1(proReviewCount);
+        proReviewerVO1.setTotal2(unReadProReviewCount);
+        proReviewerVO1.setTotal3(readProReviewCount);
+        proReviewerVO1.setList(proReviewerList);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,proReviewerVO1);
+    }
+
+    /**
+     * 设置审核状态
+     * @param vo id,status,res
+     * @return 设置审核状态
+     */
+    @RequestMapping(value = "/setReviewerStatus", method = RequestMethod.POST)
+    public BaseResult<?> setReviewerStatus(ProReviewerDetailsVO vo) {
+        ProReviewerDetailsVO detailsVO = ProReviewerDetailsVO.getFaultProReviewerDetailsVO(vo);
+        Integer version = detailsVO.getVersion();
+        Integer id = detailsVO.getId();
+        if (id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+        ProReviewerDTO proReviewDTO = proReviewerService.getProReviewDTO(id);
+        if (proReviewDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        if (proReviewDTO.getStatus() == 0) {
+            Integer status = detailsVO.getStatus();
+            String res = detailsVO.getRes();
+            if (status == 0 && res.length() == 0) {
+                return toolUtils.response(InterfaceResultEnum.LACK_NEED_PARAM,version);
+            }
+            ProReviewerDTO proReviewerDTO = new ProReviewerDTO();
+            proReviewerDTO.setId(id);
+            proReviewerDTO.setRes(res);
+            if (status == 1) {
+                proReviewerDTO.setStatus(1);
+            } else {
+                proReviewerDTO.setStatus(2);
+            }
+            proReviewerService.updateProReviewStatus(proReviewerDTO);
+            return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
+        } else  {
+            return toolUtils.response(InterfaceResultEnum.PRO_REVIEWER_STATUS_ERROR,version);
+        }
+    }
+
+    /**
+     * 审核信息详情
+     * @param vo id
+     * @return 审核信息详情
+     */
+    @RequestMapping(value = "/proReviewerInfo", method = RequestMethod.POST)
+    public BaseResult<?> proReviewerInfo(ProReviewerDetailsVO vo) {
+        ProReviewerDetailsVO detailsVO = ProReviewerDetailsVO.getFaultProReviewerDetailsVO(vo);
+        Integer version = detailsVO.getVersion();
+        Integer id = detailsVO.getId();
+        String username = detailsVO.getUsername();
+        if (id == 0 || username.length() == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+        UserDTO userDTO = userService.queryUserIdByUsername(username);
+        ProReviewerDTO proReviewDTO = proReviewerService.getProReviewDTO(id);
+        if (userDTO == null || proReviewDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        if (proReviewDTO.getReviewer().equals(userDTO.getId())) {
+            proReviewDTO.setIsShow(1);
+        } else {
+            proReviewDTO.setIsShow(0);
+        }
+        ProReviewerDetailsVO reviewerDetailsVO = new ProReviewerDetailsVO();
+        BeanUtils.copyProperties(proReviewDTO,reviewerDetailsVO);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,reviewerDetailsVO);
+    }
+
+    /**
+     * 获取屏幕电源模式信息
+     * @param vo id
+     * @return 获取屏幕电源模式信息
+     */
+    @RequestMapping(value = "/getScreenVolMode", method = RequestMethod.POST)
+    public BaseResult<?> getScreenVolMode(ScreenOpenModeVO vo) throws NoSuchFieldException, IllegalAccessException {
+        ScreenOpenModeVO screenOpenModeVO = ScreenOpenModeVO.getFaultScreenOpenModeVO(vo);
+        Integer version = screenOpenModeVO.getVersion();
+        Integer id = screenOpenModeVO.getId();
+        if (id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+        List<ScreenOpenModeDTO> modeList = screenOpenModeService.getScreenOpenModeListByScreenId(id);
+        List<ScreenModeContentDTO> dateList = new ArrayList<>();
+        for (ScreenOpenModeDTO s : modeList) {
+            ScreenModeContentDTO contentDTO = new ScreenModeContentDTO();
+            contentDTO.setMode(s.getMode());
+            contentDTO.setStartDate(s.getStartDate());
+            List<ScreenModeValueDTO> timeList = new ArrayList<>();
+            for (int i = 1; i <= 10; i ++) {
+                Field fieldTime = s.getClass().getDeclaredField("time" + i);
+                fieldTime.setAccessible(true);
+                String time = (String) fieldTime.get(s);
+                if (time != null && !time.equals("")) {
+                    Field fieldStatus = s.getClass().getDeclaredField("status" + i);
+                    fieldStatus.setAccessible(true);
+                    Integer status = (Integer) fieldStatus.get(s);
+                    ScreenModeValueDTO valueDTO = new ScreenModeValueDTO();
+                    valueDTO.setTime(time);
+                    valueDTO.setStatus(status);
+                    timeList.add(valueDTO);
+                }
+            }
+            contentDTO.setTimeList(timeList);
+            dateList.add(contentDTO);
+        }
+        ScreenOpenModeVO openModeVO = new ScreenOpenModeVO();
+        openModeVO.setDateList(dateList);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,openModeVO);
+    }
 }

+ 16 - 0
src/main/java/com/welampiot/dao/ProReviewerDao.java

@@ -1,7 +1,11 @@
 package com.welampiot.dao;
 
+import com.welampiot.dto.ProReviewerDTO;
+import com.welampiot.vo.ProReviewerVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * ClassName: ProReviewerDao
  * Package: com.welampiot.dao
@@ -17,4 +21,16 @@ public interface ProReviewerDao {
     Integer getSysInfoReadCount(@Param("userid") Integer userid);
 
     Integer getSysInfoCount(@Param("userid") Integer userid);
+
+    List<ProReviewerDTO> getProReviewerListByVO(ProReviewerVO vo);
+
+    Integer getUnReadProReviewCount(@Param("userid") Integer userid);
+
+    Integer getReadProReviewCount(@Param("userid") Integer userid);
+
+    Integer getProReviewCount(@Param("userid") Integer userid);
+
+    void updateProReviewStatus(ProReviewerDTO dto);
+
+    ProReviewerDTO getProReviewDTO(@Param("id") Integer id);
 }

+ 19 - 0
src/main/java/com/welampiot/dao/ScreenOpenModeDao.java

@@ -0,0 +1,19 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.ScreenOpenModeDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: ScreenOpenModeDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 17:07
+ * @Version: v1.0
+ */
+public interface ScreenOpenModeDao {
+    List<ScreenOpenModeDTO> getScreenOpenModeListByScreenId(@Param("screenId") Integer screenId);
+}

+ 1 - 0
src/main/java/com/welampiot/dao/UserDao.java

@@ -37,4 +37,5 @@ public interface UserDao {
     void updateUserArea(UserDTO dto);
     UserDTO getPrivilegeList(@Param("username") String username);
     UserDTO getZoneListByUserid(@Param("id") Integer id);
+    List<UserDTO> getReviewerList();
 }

+ 10 - 0
src/main/java/com/welampiot/dto/ProReviewerDTO.java

@@ -28,4 +28,14 @@ public class ProReviewerDTO implements Serializable {
     private String res; // 审核未通过原因
 
     private Integer viewStatus; // 查看状态(0 未查看,1 已查看)
+
+    private String name;
+
+    private String reviewerName;
+
+    private String path;
+
+    private Integer fileType;
+
+    private Integer isShow;
 }

+ 24 - 0
src/main/java/com/welampiot/dto/ScreenModeContentDTO.java

@@ -0,0 +1,24 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * ClassName: ScreenModeContentDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 17:01
+ * @Version: v1.0
+ */
+@Data
+public class ScreenModeContentDTO implements Serializable {
+    private String startDate;
+
+    private Integer mode;
+
+    private List<ScreenModeValueDTO> timeList;
+}

+ 21 - 0
src/main/java/com/welampiot/dto/ScreenModeValueDTO.java

@@ -0,0 +1,21 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ScreenModeValueDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 17:03
+ * @Version: v1.0
+ */
+@Data
+public class ScreenModeValueDTO implements Serializable {
+    private String time;
+
+    private Integer status;
+}

+ 55 - 0
src/main/java/com/welampiot/dto/ScreenOpenModeDTO.java

@@ -0,0 +1,55 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ScreenOpenModeDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 16:47
+ * @Version: v1.0
+ */
+@Data
+public class ScreenOpenModeDTO implements Serializable {
+    private Integer id;
+
+    private Integer screenId; // 屏幕id
+
+    private Integer mode; // 模式(0 日期,1 星期)
+
+    private String startDate; // 开始日期
+
+    private String time1;
+    private Integer status1;
+
+    private String time2;
+    private Integer status2;
+
+    private String time3;
+    private Integer status3;
+
+    private String time4;
+    private Integer status4;
+
+    private String time5;
+    private Integer status5;
+
+    private String time6;
+    private Integer status6;
+
+    private String time7;
+    private Integer status7;
+
+    private String time8;
+    private Integer status8;
+
+    private String time9;
+    private Integer status9;
+
+    private String time10;
+    private Integer status10;
+}

+ 17 - 0
src/main/java/com/welampiot/service/ProReviewerService.java

@@ -1,5 +1,10 @@
 package com.welampiot.service;
 
+import com.welampiot.dto.ProReviewerDTO;
+import com.welampiot.vo.ProReviewerVO;
+
+import java.util.List;
+
 /**
  * ClassName: ProReviewerService
  * Package: com.welampiot.service
@@ -15,4 +20,16 @@ public interface ProReviewerService {
     Integer getSysInfoReadCount(Integer userid);
 
     Integer getSysInfoCount(Integer userid);
+
+    List<ProReviewerDTO> getProReviewerListByVO(ProReviewerVO vo);
+
+    Integer getUnReadProReviewCount(Integer userid);
+
+    Integer getReadProReviewCount(Integer userid);
+
+    Integer getProReviewCount(Integer userid);
+
+    void updateProReviewStatus(ProReviewerDTO dto);
+
+    ProReviewerDTO getProReviewDTO(Integer id);
 }

+ 18 - 0
src/main/java/com/welampiot/service/ScreenOpenModeService.java

@@ -0,0 +1,18 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.ScreenOpenModeDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: ScreenOpenModeService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 17:08
+ * @Version: v1.0
+ */
+public interface ScreenOpenModeService {
+    List<ScreenOpenModeDTO> getScreenOpenModeListByScreenId(Integer screenId);
+}

+ 1 - 0
src/main/java/com/welampiot/service/UserService.java

@@ -36,4 +36,5 @@ public interface UserService {
     void updateUserArea(UserDTO dto);
     UserDTO getPrivilegeList(String username);
     UserDTO getZoneListByUserid(Integer id);
+    List<UserDTO> getReviewerList();
 }

+ 34 - 0
src/main/java/com/welampiot/service/impl/ProReviewerServiceImpl.java

@@ -1,10 +1,14 @@
 package com.welampiot.service.impl;
 
 import com.welampiot.dao.ProReviewerDao;
+import com.welampiot.dto.ProReviewerDTO;
 import com.welampiot.service.ProReviewerService;
+import com.welampiot.vo.ProReviewerVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * ClassName: ProReviewerServiceImpl
  * Package: com.welampiot.service.impl
@@ -33,4 +37,34 @@ public class ProReviewerServiceImpl implements ProReviewerService {
     public Integer getSysInfoCount(Integer userid) {
         return proReviewerDao.getSysInfoCount(userid);
     }
+
+    @Override
+    public List<ProReviewerDTO> getProReviewerListByVO(ProReviewerVO vo) {
+        return proReviewerDao.getProReviewerListByVO(vo);
+    }
+
+    @Override
+    public Integer getUnReadProReviewCount(Integer userid) {
+        return proReviewerDao.getUnReadProReviewCount(userid);
+    }
+
+    @Override
+    public Integer getReadProReviewCount(Integer userid) {
+        return proReviewerDao.getReadProReviewCount(userid);
+    }
+
+    @Override
+    public Integer getProReviewCount(Integer userid) {
+        return proReviewerDao.getProReviewCount(userid);
+    }
+
+    @Override
+    public void updateProReviewStatus(ProReviewerDTO dto) {
+        proReviewerDao.updateProReviewStatus(dto);
+    }
+
+    @Override
+    public ProReviewerDTO getProReviewDTO(Integer id) {
+        return proReviewerDao.getProReviewDTO(id);
+    }
 }

+ 29 - 0
src/main/java/com/welampiot/service/impl/ScreenOpenModeServiceImpl.java

@@ -0,0 +1,29 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.ScreenOpenModeDao;
+import com.welampiot.dto.ScreenOpenModeDTO;
+import com.welampiot.service.ScreenOpenModeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * ClassName: ScreenOpenModeServiceImpl
+ * Package: com.welampiot.service.impl
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 17:09
+ * @Version: v1.0
+ */
+@Service
+public class ScreenOpenModeServiceImpl implements ScreenOpenModeService {
+    @Autowired
+    private ScreenOpenModeDao screenOpenModeDao;
+
+    @Override
+    public List<ScreenOpenModeDTO> getScreenOpenModeListByScreenId(Integer screenId) {
+        return screenOpenModeDao.getScreenOpenModeListByScreenId(screenId);
+    }
+}

+ 5 - 0
src/main/java/com/welampiot/service/impl/UserServiceImpl.java

@@ -164,4 +164,9 @@ public class UserServiceImpl implements UserService {
     public UserDTO getZoneListByUserid(Integer id) {
         return userDao.getZoneListByUserid(id);
     }
+
+    @Override
+    public List<UserDTO> getReviewerList() {
+        return userDao.getReviewerList();
+    }
 }

+ 68 - 0
src/main/java/com/welampiot/vo/ProReviewerDetailsVO.java

@@ -0,0 +1,68 @@
+package com.welampiot.vo;
+
+import lombok.Data;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ProReviewerDetailsVO
+ * Package: com.welampiot.vo
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 15:05
+ * @Version: v1.0
+ */
+@Data
+public class ProReviewerDetailsVO implements Serializable {
+    private Integer id;
+
+    private Integer reviewer; // 审核人
+
+    private Integer userid; // 提交人
+
+    private Integer proId; // 素材id
+
+    private Integer status; // 审核状态(0 初始,1 通过,2 未通过)
+
+    private String res; // 审核未通过原因
+
+    private Integer viewStatus; // 查看状态(0 未查看,1 已查看)
+
+    private String name;
+
+    private String reviewerName;
+
+    private String path;
+
+    private Integer fileType;
+
+    private Integer isShow;
+
+    private String username;
+
+    private Integer version;
+
+    @NotNull
+    @Contract("_ -> param1")
+    public static ProReviewerDetailsVO getFaultProReviewerDetailsVO(@NotNull ProReviewerDetailsVO vo) {
+        if (vo.getVersion() == null) {
+            vo.setVersion(0);
+        }
+        if (vo.getId() == null) {
+            vo.setId(0);
+        }
+        if (vo.getStatus() == null) {
+            vo.setStatus(0);
+        }
+        if (vo.getRes() == null) {
+            vo.setRes("");
+        }
+        if (vo.getUsername() == null) {
+            vo.setUsername("");
+        }
+        return vo;
+    }
+}

+ 61 - 0
src/main/java/com/welampiot/vo/ProReviewerVO.java

@@ -0,0 +1,61 @@
+package com.welampiot.vo;
+
+import com.welampiot.dto.ProReviewerDTO;
+import lombok.Data;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * ClassName: ProReviewerVO
+ * Package: com.welampiot.vo
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 10:57
+ * @Version: v1.0
+ */
+@Data
+public class ProReviewerVO implements Serializable {
+    private Integer page;
+
+    private Integer count;
+
+    private String status;
+
+    private Integer userid;
+
+    private String username;
+
+    private Integer version;
+
+    private Integer total;
+    private Integer total1;
+    private Integer total2;
+    private Integer total3;
+
+    private List<ProReviewerDTO> list;
+
+    @NotNull
+    @Contract("_ -> param1")
+    public static ProReviewerVO getFaultProReviewerVO(@NotNull ProReviewerVO vo) {
+        if (vo.getPage() == null || vo.getPage() == 0) {
+            vo.setPage(1);
+        }
+        if (vo.getCount() == null || vo.getCount() == 0) {
+            vo.setCount(16);
+        }
+        if (vo.getStatus() == null) {
+            vo.setStatus("");
+        }
+        if (vo.getUsername() == null) {
+            vo.setUsername("");
+        }
+        if (vo.getVersion() == null) {
+            vo.setVersion(0);
+        }
+        return vo;
+    }
+}

+ 40 - 0
src/main/java/com/welampiot/vo/ScreenOpenModeVO.java

@@ -0,0 +1,40 @@
+package com.welampiot.vo;
+
+import com.welampiot.dto.ScreenModeContentDTO;
+import lombok.Data;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * ClassName: ScreenOpenModeVO
+ * Package: com.welampiot.vo
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/8/8 - 16:59
+ * @Version: v1.0
+ */
+@Data
+public class ScreenOpenModeVO implements Serializable {
+
+    private Integer version;
+
+    private Integer id;
+
+    private List<ScreenModeContentDTO> dateList;
+
+    @NotNull
+    @Contract("_ -> param1")
+    public static ScreenOpenModeVO getFaultScreenOpenModeVO(@NotNull ScreenOpenModeVO vo) {
+        if (vo.getVersion() == null) {
+            vo.setVersion(0);
+        }
+        if (vo.getId() == null) {
+            vo.setId(0);
+        }
+        return vo;
+    }
+}

+ 65 - 0
src/main/resources/mapper/ProReviewerMapper.xml

@@ -21,5 +21,70 @@
         from pro_reviewer p
         where p.reviewer = #{userid}
     </select>
+    
+    <select id="getProReviewerListByVO" resultType="ProReviewerDTO">
+        select
+            p.id,
+            p1.name,
+            u.name as reviewerName,
+            p1.path,
+            p1.fileType,
+            p.status,
+            p.reviewer
+        from pro_reviewer p
+        left join program p1 on p1.id = p.pro_id
+        left join user u on u.id = p.reviewer
+        where (p.reviewer = #{userid} or p.user_id = #{userid})
+        <choose>
+            <when test="status == '0'">
+                and p.view_status = 0
+            </when>
+            <when test="status == '1'">
+                and p.view_status = 1
+            </when>
+        </choose>
+        <if test="page >= 0 and count > 0">
+            limit #{page},#{count}
+        </if>
+    </select>
+
+    <select id="getUnReadProReviewCount" resultType="Integer">
+        select count(p.id)
+        from pro_reviewer p
+        where (p.reviewer = #{userid} or p.user_id = #{userid})
+          and p.view_status = 0
+    </select>
+
+    <select id="getReadProReviewCount" resultType="Integer">
+        select count(p.id)
+        from pro_reviewer p
+        where (p.reviewer = #{userid} or p.user_id = #{userid})
+          and p.view_status = 1
+    </select>
+
+    <select id="getProReviewCount" resultType="Integer">
+        select count(p.id)
+        from pro_reviewer p
+        where p.reviewer = #{userid} or p.user_id = #{userid}
+    </select>
+
+    <update id="updateProReviewStatus" parameterType="ProReviewerDTO">
+        update
+            pro_reviewer p
+        set
+            <if test="res != null and res != ''">
+                p.res = #{res},
+            </if>
+            p.status = #{status}
+        where
+            p.id = #{id}
+    </update>
+
+    <select id="getProReviewDTO" resultType="ProReviewerDTO">
+        select p.id,p.status,p1.name,p1.path,p1.fileType,p.reviewer
+        from pro_reviewer p
+        left join program p1 on p1.id = p.pro_id
+        where p.id = #{id}
+    </select>
 
 </mapper>

+ 22 - 0
src/main/resources/mapper/ScreenOpenModeMapper.xml

@@ -0,0 +1,22 @@
+<?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.welampiot.dao.ScreenOpenModeDao">
+    
+    <select id="getScreenOpenModeListByScreenId" resultType="ScreenOpenModeDTO">
+        select
+            s.id,s.mode,s.start_date as startDate,
+            s.time1,s.status1,
+            s.time2,s.status2,
+            s.time3,s.status3,
+            s.time4,s.status4,
+            s.time5,s.status5,
+            s.time6,s.status6,
+            s.time7,s.status7,
+            s.time8,s.status8,
+            s.time9,s.status9,
+            s.time10,s.status10
+        from screen_open_mode s
+        where s.screen_id = #{screenId}
+    </select>
+
+</mapper>

+ 6 - 0
src/main/resources/mapper/UserMapper.xml

@@ -351,4 +351,10 @@
         where u.id = #{id}
     </select>
     
+    <select id="getReviewerList" resultType="UserDTO">
+        select u.id,u.name,u.privilege_list as privilegeList
+        from user u
+        where u.is_examine = 1
+    </select>
+    
 </mapper>