Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_svr

hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/RemoteUserService.java

@@ -51,4 +51,16 @@ public interface RemoteUserService
      */
     @PutMapping("/user/recordlogin")
     public R<Boolean> recordUserLogin(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 测试Feign跨服务调用
+     */
+    @PostMapping("/business/study/testFeign")
+    public void testFeign();
+
+    /**
+     * 自动归还试验
+     */
+    @PostMapping("/business/study/autoGh")
+    public void autoGhStudy();
 }

hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/factory/RemoteUserFallbackFactory.java

@@ -42,6 +42,14 @@ public class RemoteUserFallbackFactory implements FallbackFactory
             {
                 return R.fail("记录用户登录信息失败:" + throwable.getMessage());
             }
+
+            @Override
+            public void testFeign() {
+            }
+
+            @Override
+            public void autoGhStudy() {
+            }
         };
     }
 }

hxhq-common/hxhq-common-security/src/main/java/com/hxhq/common/security/config/BaseMetaObjectHandler.java

@@ -41,7 +41,7 @@ public class BaseMetaObjectHandler implements MetaObjectHandler {
 		// 创建用户
 		Object createBy = getFieldValByName(CREATE_BY, metaObject);
 		if (createBy == null || "".equals(createBy)) {
-			setFieldValByName(CREATE_BY, SecurityUtils.getLoginUserOfEmpty().getUserid()==null?"": SecurityUtils.getLoginUserOfEmpty().getUserid().toString(), metaObject);
+			setFieldValByName(CREATE_BY, SecurityUtils.getLoginUserOfEmpty()==null || SecurityUtils.getLoginUserOfEmpty().getUserid()==null?"": SecurityUtils.getLoginUserOfEmpty().getUserid().toString(), metaObject);
 		}
 
 		// 创建时间
@@ -61,7 +61,7 @@ public class BaseMetaObjectHandler implements MetaObjectHandler {
 	public void updateFill(MetaObject metaObject) {
 //		Object updateBy = getFieldValByName(UPDATE_BY, metaObject);
 //		if (updateBy == null || updateBy.equals("")) {
-		setFieldValByName(UPDATE_BY, SecurityUtils.getLoginUserOfEmpty().getUserid()==null?"": SecurityUtils.getLoginUserOfEmpty().getUserid().toString(), metaObject);
+		setFieldValByName(UPDATE_BY, SecurityUtils.getLoginUserOfEmpty()==null || SecurityUtils.getLoginUserOfEmpty().getUserid()==null?"": SecurityUtils.getLoginUserOfEmpty().getUserid().toString(), metaObject);
 //		}
 
 		// 更新用户

hxhq-modules/hxhq-job/pom.xml

@@ -70,12 +70,6 @@
             <groupId>com.hxhq</groupId>
             <artifactId>hxhq-common-swagger</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.hxhq</groupId>
-            <artifactId>hxhq-modules-system</artifactId>
-            <version>3.6.6</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

hxhq-modules/hxhq-job/src/main/java/com/hxhq/job/task/RyTask.java

@@ -1,35 +1,24 @@
 package com.hxhq.job.task;
 
-import com.hxhq.business.service.IGyzjFfjlService;
-import com.hxhq.business.service.IGyzjService;
-import com.hxhq.business.service.IMjyFfjlService;
-import com.hxhq.business.service.IMjyService;
+import com.hxhq.system.api.RemoteUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.hxhq.common.core.utils.StringUtils;
 
-import java.util.Date;
-
 /**
  * 定时任务调度测试
- * 
+ *
  * @author hxhq
  */
 @Component("ryTask")
 public class RyTask
 {
     protected Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Autowired
-    private IGyzjService gyzjService;
     @Autowired
-    private IGyzjFfjlService gyzjFfjlService;
-    @Autowired
-    private IMjyService mjyService;
-    @Autowired
-    private IMjyFfjlService mjyFfjlService;
+    private RemoteUserService remoteUserService;
+
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
@@ -46,44 +35,17 @@ public class RyTask
         System.out.println("执行无参方法");
     }
 
-
-    //region 麻精药
-
-    /**
-     * 麻精药借阅到期自动归还
-     */
-    public void autoJyExpireReturnMjy()
+    public void testJob()
     {
-        mjyService.autoJyExpireReturn();
+        System.out.println("testJob");
+        remoteUserService.testFeign();
     }
 
     /**
-     * 麻精药发放记录借阅到期自动归还
+     * 到期自动归还试验
      */
-    public void autoJyExpireReturnMjyFfjl()
+    public void autoGhStudy()
     {
-        mjyFfjlService.autoJyExpireReturn();
+        remoteUserService.autoGhStudy();
     }
-
-    //endregion
-
-    //region 给药制剂
-
-    /**
-     * 给药制剂借阅到期自动归还
-     */
-    public void autoJyExpireReturnGyzj()
-    {
-        gyzjService.autoJyExpireReturn();
-    }
-
-    /**
-     * 给药制剂发放记录借阅到期自动归还
-     */
-    public void autoJyExpireReturnGyzjFfjl()
-    {
-        gyzjFfjlService.autoJyExpireReturn();
-    }
-
-    //endregion
 }

hxhq-modules/hxhq-job/src/main/resources/bootstrap.yml

@@ -25,3 +25,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+# token配置
+token:
+  # 是否允许账户多终端同时登录（true允许 false不允许）
+  soloLogin: false

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyController.java

@@ -392,5 +392,23 @@ public class StudyController extends BaseController
         return AjaxResult.success();
     }
 
+    /**
+     * 测试Feign
+     */
+    @PostMapping("/testFeign")
+    public void testFeign()
+    {
+        logger.info("testFeign进来");
+    }
+
+    /**
+     * 自动归还到期试验
+     */
+    @PostMapping("/autoGh")
+    public void autoGh()
+    {
+        studyService.autoGh();
+    }
+
     //endregion
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyService.java

@@ -148,6 +148,11 @@ public interface IStudyService extends IService
      */
     void gh(StudySaveForm form);
 
+    /**
+     * 到期自动归还
+     */
+    void autoGh();
+
     // endregion
 
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java

@@ -532,7 +532,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),study.getStatus().equals(StudyStatusEnum.ysd.getValue())?"拒绝归档":"同意归档");
 
         String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请归档已"+sign.getQmyy()+(study.getStatus().equals(StudyStatusEnum.ysd.getValue())?("，原因："+sign.getRemark()):"");
-        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
+        noticeService.save(title,info.getLeader(),getNoticeUrl(info));
     }
 
     private String getNoticeUrl(Study study){
@@ -562,7 +562,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),study.getStatus().equals(StudyStatusEnum.gd.getValue())?"拒绝解档":"同意解档");
 
         String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请解档已"+sign.getQmyy()+(study.getStatus().equals(StudyStatusEnum.gd.getValue())?("，原因："+sign.getRemark()):"");
-        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
+        noticeService.save(title,info.getLeader(),getNoticeUrl(info));
     }
 
     @Override
@@ -589,7 +589,7 @@ public class StudyServiceImpl extends ServiceImpl implements
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?"拒绝借阅":"同意借阅");
 
         String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请借阅已"+sign.getQmyy()+(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?("，原因："+sign.getRemark()):"");
-        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
+        noticeService.save(title,info.getLeader(),getNoticeUrl(info));
     }
 
     @Override
@@ -615,7 +615,33 @@ public class StudyServiceImpl extends ServiceImpl implements
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),"确认归还");
 
         String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请借阅已确认归还";
-        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
+        noticeService.save(title,info.getLeader(),getNoticeUrl(info));
+    }
+
+    @Override
+    @Transactional
+    public void autoGh() {
+        QueryWrapper<Study> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status",StudyStatusEnum.gd.getValue());
+        queryWrapper.eq("borrow_status",StudyBorrowStatusEnum.jyz.getValue());
+        queryWrapper.lt("borrow_end_date",DateUtils.getDate());
+        List<Study> studyList = list(queryWrapper);
+        for(Study info : studyList){
+            try{
+                info.setBorrowStatus(StudyBorrowStatusEnum.wjy.getValue());
+                updateById(info);
+
+                SignForm sign = new SignForm();
+                sign.setQmyy("到期自动归还");
+                sign.setQmyyEn("Check-out End on Time");
+                studyJcgjService.saveInfo(info.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign);
+
+                String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请借阅已到期自动归还";
+                noticeService.save(title,info.getLeader(),getNoticeUrl(info));
+            }catch (Exception e){
+                log.error("自动归还试验出错",e);
+            }
+        }
     }
 
     //endregion