修改获取昵称

zhyc-common/src/main/java/com/zhyc/common/utils/SecurityUtils.java

@@ -66,6 +66,21 @@ public class SecurityUtils
         }
     }
 
+    /**
+     * 用户昵称
+     **/
+    public static String getNickName()
+    {
+        try
+        {
+            return getLoginUser().getUser().getNickName();
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("获取用户昵称异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
+
     /**
      * 获取用户
      **/

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java

@@ -35,8 +35,8 @@ public class Disinfect extends BaseEntity
     private Integer[] sheepfoldIds;
 
     /** 消毒日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @Excel(name = "消毒日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "消毒日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date datetime;
 
     /** 技术员 */

zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwPrescription.java

@@ -49,90 +49,4 @@ public class SwPrescription extends BaseEntity
     /** 处方详情信息 */
     private List<SwPresDetail> swPresDetailList;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-
-    public void setNo(String no) 
-    {
-        this.no = no;
-    }
-
-    public String getNo() 
-    {
-        return no;
-    }
-
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-
-    public void setPersType(Integer persType) 
-    {
-        this.persType = persType;
-    }
-
-    public Integer getPersType() 
-    {
-        return persType;
-    }
-
-    public void setComment(String comment) 
-    {
-        this.comment = comment;
-    }
-
-    public String getComment() 
-    {
-        return comment;
-    }
-
-    public void setStatus(Integer status) 
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus() 
-    {
-        return status;
-    }
-
-    public List<SwPresDetail> getSwPresDetailList()
-    {
-        return swPresDetailList;
-    }
-
-    public void setSwPresDetailList(List<SwPresDetail> swPresDetailList)
-    {
-        this.swPresDetailList = swPresDetailList;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("no", getNo())
-            .append("name", getName())
-            .append("persType", getPersType())
-            .append("comment", getComment())
-            .append("status", getStatus())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("swPresDetailList", getSwPresDetailList())
-            .toString();
-    }
 }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java

@@ -72,7 +72,7 @@ public class DewormServiceImpl implements IDewormService
     @Transactional
     public int insertDeworm(Deworm deworm)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         //        使用记录的文件
         SwMedicineUsage medicineUsage = new SwMedicineUsage();
         medicineUsage.setSwMedicineUsageDetailsList(deworm.getUsageDetails());
@@ -115,7 +115,7 @@ public class DewormServiceImpl implements IDewormService
     @Transactional
     public int updateDeworm(Deworm deworm)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         for (SwMedicineUsageDetails usageDetail : deworm.getUsageDetails()) {
             usageDetail.setMediUsage(deworm.getUsageId());
         }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java

@@ -72,7 +72,7 @@ public class DiagnosisServiceImpl implements IDiagnosisService
         diagnosis.setGender(String.valueOf(sheepFile.getGender()));
         diagnosis.setMonthAge(sheepFile.getMonthAge());
 
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         diagnosis.setCreateBy(username);
         diagnosis.setCreateTime(DateUtils.getNowDate());
         if (!Objects.equals(sheepFile.getSheepfoldId(), diagnosis.getSheepfoldId())){
@@ -98,7 +98,7 @@ public class DiagnosisServiceImpl implements IDiagnosisService
         BasSheep basSheep = new BasSheep();
         basSheep.setId(diagnosis.getSheepId());
         basSheep.setSheepfoldId(diagnosis.getSheepfoldId());
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         basSheep.setUpdateBy(username);
         basSheep.setUpdateTime(DateUtils.getNowDate());
         diagnosis.setUpdateBy(username);

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java

@@ -73,7 +73,7 @@ public class DisinfectServiceImpl implements IDisinfectService
     @Override
     public int insertDisinfect(Disinfect disinfect)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         //        使用记录的文件
         SwMedicineUsage medicineUsage = new SwMedicineUsage();
         medicineUsage.setSwMedicineUsageDetailsList(disinfect.getUsageDetails());
@@ -114,7 +114,7 @@ public class DisinfectServiceImpl implements IDisinfectService
         }
         medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(disinfect.getUsageId());
         medicineUsageMapper.batchSwMedicineUsageDetails(disinfect.getUsageDetails());
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         disinfect.setUpdateBy(username);
         disinfect.setUpdateTime(DateUtils.getNowDate());
         return disinfectMapper.updateDisinfect(disinfect);

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java

@@ -73,7 +73,7 @@ public class HealthServiceImpl implements IHealthService
     @Override
     public int insertHealth(Health health)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
 
         //        使用记录的文件
         SwMedicineUsage medicineUsage = new SwMedicineUsage();
@@ -119,7 +119,7 @@ public class HealthServiceImpl implements IHealthService
         }
         medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(health.getUsageId());
         medicineUsageMapper.batchSwMedicineUsageDetails(health.getUsageDetails());
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         health.setUpdateBy(username);
         health.setUpdateTime(DateUtils.getNowDate());
         return healthMapper.updateHealth(health);

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java

@@ -75,7 +75,7 @@ public class ImmunityServiceImpl implements IImmunityService
     @Override
     public int insertImmunity(Immunity immunity)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
 
         //        使用记录的文件
         SwMedicineUsage medicineUsage = new SwMedicineUsage();
@@ -128,6 +128,8 @@ public class ImmunityServiceImpl implements IImmunityService
         }
         medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(immunity.getUsageId());
         medicineUsageMapper.batchSwMedicineUsageDetails(immunity.getUsageDetails());
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
+        immunity.setUpdateBy(username);
         immunity.setUpdateTime(DateUtils.getNowDate());
         return immunityMapper.updateImmunity(immunity);
     }

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java

@@ -60,7 +60,7 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
     @Override
     public int insertQuarantineReport(QuarantineReport quarantineReport)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         quarantineReport.setCreateBy(username);
         quarantineReport.setCreateTime(DateUtils.getNowDate());
         if (quarantineReport.getResult()==null){
@@ -96,7 +96,7 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
     @Override
     public int updateQuarantineReport(QuarantineReport quarantineReport)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         quarantineReport.setUpdateBy(username);
         quarantineReport.setUpdateTime(DateUtils.getNowDate());
         return quarantineReportMapper.updateQuarantineReport(quarantineReport);

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java

@@ -59,7 +59,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
     @Override
     public int insertSwMedicineUsage(SwMedicineUsage swMedicineUsage)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         swMedicineUsage.setCreateBy(username);
         swMedicineUsage.setCreateTime(DateUtils.getNowDate());
         int rows = swMedicineUsageMapper.insertSwMedicineUsage(swMedicineUsage);
@@ -77,7 +77,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
     @Override
     public int updateSwMedicineUsage(SwMedicineUsage swMedicineUsage)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         swMedicineUsage.setUpdateBy(username);
         swMedicineUsage.setUpdateTime(DateUtils.getNowDate());
         swMedicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(swMedicineUsage.getId());

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwPrescriptionServiceImpl.java

@@ -59,7 +59,8 @@ public class SwPrescriptionServiceImpl implements ISwPrescriptionService
     @Override
     public int insertSwPrescription(SwPrescription swPrescription)
     {
-        String username = SecurityUtils.getUsername();
+//        获取创建人的用户名称
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         swPrescription.setCreateBy(username);
         swPrescription.setCreateTime(DateUtils.getNowDate());
         int rows = swPrescriptionMapper.insertSwPrescription(swPrescription);
@@ -77,7 +78,7 @@ public class SwPrescriptionServiceImpl implements ISwPrescriptionService
     @Override
     public int updateSwPrescription(SwPrescription swPrescription)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         swPrescription.setUpdateBy(username);
         swPrescription.setUpdateTime(DateUtils.getNowDate());
         swPrescriptionMapper.deleteSwPresDetailByPersId(swPrescription.getId());

zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java

@@ -73,7 +73,7 @@ public class TreatmentServiceImpl implements ITreatmentService
     @Transactional
     public int insertTreatment(Treatment treatment)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
 //        使用记录的文件
         SwMedicineUsage medicineUsage = new SwMedicineUsage();
         medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails());
@@ -134,7 +134,7 @@ public class TreatmentServiceImpl implements ITreatmentService
     @Transactional
     public int updateTreatment(Treatment treatment)
     {
-        String username = SecurityUtils.getUsername();
+        String username = SecurityUtils.getLoginUser().getUser().getNickName();
         for (SwMedicineUsageDetails usageDetail : treatment.getUsageDetails()) {
             usageDetail.setMediUsage(treatment.getUsageId());
         }