fengji 修改操作手册

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/RedemptionCodeDao.java

@@ -18,6 +18,6 @@ public interface RedemptionCodeDao extends BaseMapper<AppRedemptionCode> {
 
     AppRedemptionCode findFirstNull();
 
-    int findNull();
+    Integer findNull();
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysManual.java

@@ -55,6 +55,14 @@ public class SysManual implements Serializable {
     @ApiModelProperty(value = "操作人")
     private Integer operatorId;
 
+    @ApiModelProperty(value = "操作人名称")
+    private String operatorName;
+
+    @ApiModelProperty(value = "菜单名")
+    private String menuName;
+
+    // -------------------------------------------------------------------------
+
     public String getOperatorName() {
         return operatorName;
     }
@@ -63,8 +71,13 @@ public class SysManual implements Serializable {
         this.operatorName = operatorName;
     }
 
-    @ApiModelProperty(value = "操作人名称")
-    private String operatorName;
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
 
     private static final long serialVersionUID = 1L;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/AppRedemptionCodeServiceImpl.java

@@ -14,6 +14,7 @@ import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.excel.POIUtil;
 import com.ym.mec.util.ini.IniFileUtil;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
@@ -108,8 +109,8 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
 
     @Override
     public void checkLowVolume() {
-        int volume = redemptionCodeDao.findNull();
-        if (volume < 10) {
+        Integer volume = redemptionCodeDao.findNull();
+        if (volume == null || volume < 10) {
             Map<Integer, String> receivers = new HashMap<>(1);
             receivers.put(0, "13512341234");
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,

mec-biz/src/main/resources/config/mybatis/SysManualMapper.xml

@@ -28,6 +28,7 @@
     <select id="findRecordCount" resultType="java.lang.Integer">
         select count(1) from sys_manual sm
         left join sys_user u on sm.operator_id_ = u.id_
+        left join sys_menu m on sm.menu_id_ = m.id_
         <where>
             1 = 1
             <if test="menuId != null and menuId != '' ">
@@ -42,8 +43,11 @@
 
     <select id="queryRecord" resultType="com.ym.mec.biz.dal.entity.SysManual">
         select sm.*
-             , u.username_ as operatorName from sys_manual sm
+             , u.username_ as operatorName
+             , m.name_ as menuName
+        from sys_manual sm
         left join sys_user u on sm.operator_id_ = u.id_
+        left join sys_menu m on sm.menu_id_ = m.id_
         <where>
             1 = 1
             <if test="menuId != null and menuId != '' ">