Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryBaseEOController.java

@@ -60,10 +60,12 @@ public class AuthDummyInventoryBaseEOController extends JeroController<AuthDummy
 								   @RequestParam(name="cut", defaultValue="cn") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<AuthDummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryBaseEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
+
 		Page<AuthDummyInventoryBaseEO> page = new Page<AuthDummyInventoryBaseEO>(pageNo, pageSize);
-		IPage<AuthDummyInventoryBaseEO> pageList = authDummyInventoryBaseEOService.page(page, queryWrapper);
+		IPage<AuthDummyInventoryBaseEO> pageList = authDummyInventoryBaseEOService.getPageInfo(page, queryWrapper);
-		this.authDummyInventoryBaseEOService.disposeData(page.getRecords(),cut);
+//		this.authDummyInventoryBaseEOService.disposeData(page.getRecords(),cut);
-		return Result.OK(pageList);
+		return Result.OK(authDummyInventoryBaseEO.getCut(),pageList);
 	}
 
     /**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryBaseEO.java

@@ -80,4 +80,8 @@ public class AuthDummyInventoryBaseEO implements Serializable {
 
     @TableField(exist = false)
     private String cut;
+
+    /**订阅标识*/
+    @TableField(exist = false)
+    private String readFlag;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryBaseEOService.java

@@ -1,6 +1,9 @@
 package com.jero.modules.authDummy.service;
 
 import com.alibaba.fastjson.JSONObject;
+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.jero.common.api.vo.Result;
 import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -92,4 +95,12 @@ public interface IAuthDummyInventoryBaseEOService extends IService<AuthDummyInve
 	 * @param authDummyInventoryBaseEO
 	 */
 	void issue(AuthDummyInventoryBaseEO authDummyInventoryBaseEO)throws Exception;
+
+	/**
+	 * 分页
+	 * @param page
+	 * @param queryWrapper
+	 * @return
+	 */
+	IPage<AuthDummyInventoryBaseEO> getPageInfo(Page<AuthDummyInventoryBaseEO> page, QueryWrapper<AuthDummyInventoryBaseEO> queryWrapper);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java

@@ -3,8 +3,11 @@ package com.jero.modules.authDummy.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
@@ -25,6 +28,7 @@ import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
 import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
 import com.jero.modules.dummy.entity.DummyReadEO;
 import com.jero.modules.dummy.enums.InventoryStateEnum;
+import com.jero.modules.dummy.enums.ReadFlagEnum;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.system.entity.SysAnnouncement;
@@ -82,6 +86,9 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyIn
 	@Autowired
 	private ISysAnnouncementService sysAnnouncementService;
 
+	@Autowired
+	private IAuthDummyReadEOService iAuthDummyReadEOService;
+
 	@Value(value = "${jero.backUrl}")
 	private String backUrl;
 
@@ -439,4 +446,30 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl<AuthDummyIn
 			}
 		}
 	}
+
+	@Override
+	public IPage<AuthDummyInventoryBaseEO> getPageInfo(Page<AuthDummyInventoryBaseEO> page, QueryWrapper<AuthDummyInventoryBaseEO> queryWrapper) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		IPage<AuthDummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
+		if (pageList.getRecords().size() != 0) {
+			List<AuthDummyInventoryBaseEO> records = pageList.getRecords();
+			//订阅标识
+			List<String> ids = records.stream().map(AuthDummyInventoryBaseEO::getId).collect(Collectors.toList());
+			LambdaQueryWrapper<AuthDummyReadEO> wrapper = new LambdaQueryWrapper<>();
+			wrapper.in(AuthDummyReadEO::getAuthDummyInventoryBaseId, ids).in(AuthDummyReadEO::getCreateBy,sysUser.getUsername());
+			List<AuthDummyReadEO> authDummyReadEOS = iAuthDummyReadEOService.list(wrapper);
+			List<String> authDummyReadIdList = authDummyReadEOS.stream().map(AuthDummyReadEO::getAuthDummyInventoryBaseId).collect(Collectors.toList());
+			for (AuthDummyInventoryBaseEO record : pageList.getRecords()) {
+				//订阅标识
+				if(authDummyReadIdList.contains(record.getId())){
+					record.setReadFlag(ReadFlagEnum.READ.getValue());
+				}else{
+					record.setReadFlag(ReadFlagEnum.CANCEL_READ.getValue());
+				}
+			}
+		}
+
+		return pageList;
+	}
 }

jero-web/src/views/virtualAuthenticationList/index.vue

@@ -353,9 +353,9 @@ export default {
         onOk() {
           let url = ''
           if (val.readFlag == 0 || !val.readFlag) {
-            url = 'dummy/dummyInventoryBaseEO/read'
+            url = '/authDummy/authDummyInventoryBaseEO/read'
           } else {
-            url = 'dummy/dummyInventoryBaseEO/cancelRead'
+            url = '/authDummy/authDummyInventoryBaseEO/cancelRead'
           }
           getAction(url, { id: val.id }).then((res) => {
             if (res.success) {

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -259,7 +259,7 @@ export default {
       url:{
         list: '/authDummy/authDummyInventoryInfoEO/page',
         logList: '',//更新log
-        exportTemplate: '',//模板下载
+        exportTemplate: '/authDummy/authDummyInventoryInfoEO/exportTemplate',//模板下载
         exportData: '',//导出
         addModel: '/authDummy/authDummyInventoryInfoEO/add',//添加
         copyInfo: '/authDummy/authDummyInventoryInfoEO/copyInfoByIds',//复制