（咨询记录）日常更新

src/main/java/com/caimei/modules/sys/web/NotificationController.java

@@ -43,7 +43,6 @@ import java.util.List;
  */
 //@Controller
 @Configuration
-@EnableScheduling
 @RequestMapping(value = "${adminPath}/sys/Notification")
 public class NotificationController extends BaseController {
 
@@ -64,227 +63,6 @@ public class NotificationController extends BaseController {
     @RequestMapping(value = {"list", ""})
     public String list( Notification notifi,HttpServletRequest request, HttpServletResponse response, Model model) {
 
-
-//        //械字号资质证书3个月后过期
-//        Integer count=0;
-//        String name="";
-//        String productID="";
-//        String shopID="";
-//        Date date=new Date();
-//        String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//        //资质证书
-//       List<Product>pro=notificationDao.productTypeCount(3);
-//        List<Product>pro1=notificationDao.productTypeCount(1);
-//        List<Product>pro2=notificationDao.productTypeCount1(7);
-//        List<Product>pro3=notificationDao.productTypeCount1(1);
-//        //上架费
-//        List<Product>product=notificationDao.productTypeCount2(3);
-//        List<Product>product1=notificationDao.productTypeCount2(1);
-//        List<Product>product2=notificationDao.productTypeCount3(7);
-//        List<Product>product3=notificationDao.productTypeCount3(1);
-////
-//        Jedis jedis=null;
-//        String constraint="";
-//        if(domain.contains("-b")){
-//             jedis=new Jedis("172.31.165.27", 6379);
-//             jedis.auth("6#xsI%b4o@5c3RoE");
-//        }else if(domain.contains("localhost")){
-//             jedis=new Jedis("192.168.2.100", 6379);
-//        }else {
-//            jedis=new Jedis("172.31.165.23", 6379);
-//        }
-//
-//        if(!"1".equals(jedis.rpop("constraint"))){
-//            jedis.lpush("constraint","0");
-//
-//        }
-//        constraint=jedis.rpop("constraint");
-//        System.out.println(jedis.rpop("constraint"));
-//      if("0".equals(constraint)){
-//       for (int i=0;i<pro.size();i++){
-//           MessageCenter messageCenter = new MessageCenter();
-//           messageCenter.setShopId(pro.get(i).getShopID());
-//           messageCenter.setClubId(null);
-//           messageCenter.setUserType(2);
-//           messageCenter.setMessageType(2);
-//           messageCenter.setShopMessType(5);
-//           messageCenter.setContent("该商品的资质证书将于3个月后失效，请及时登录采美网站上传新证书。");
-//           messageCenter.setTime(curDateStr);
-//           messageCenterDao.addMessageCenter(messageCenter);
-//
-//           if(i!=0){
-//               name+=",";
-//               productID+=",";
-//           }
-//          name +="("+pro.get(i).getProductID().toString()+")"+pro.get(i).getName();
-//           productID+=pro.get(i).getProductID().toString();
-//    }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下械字号商品的资质证书将于3个月后失效，请及时提醒供应商更换证书。");
-//            notification.setShopContent(name);
-//            notification.setPorductID(productID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            productID="";
-//        }
-//        //械字号资质证书1个月后过期
-//        for (int i=0;i<pro1.size();i++){
-//
-//            MessageCenter messageCenter = new MessageCenter();
-//            messageCenter.setShopId(pro1.get(i).getShopID());
-//            messageCenter.setClubId(null);
-//            messageCenter.setUserType(2);
-//            messageCenter.setMessageType(2);
-//            messageCenter.setShopMessType(5);
-//            messageCenter.setContent("该商品的资质证书将于1个月后失效，请及时登录采美网站上传新证书。");
-//            messageCenter.setTime(curDateStr);
-//            messageCenterDao.addMessageCenter(messageCenter);
-//            if(i!=0){
-//                name+=",";
-//                productID+=",";
-//            }
-//            name +="("+pro1.get(i).getProductID().toString()+")"+pro.get(i).getName();
-//            productID+=pro1.get(i).getProductID().toString();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下械字号商品的资质证书将于1个月后失效，请及时提醒供应商更换证书。");
-//            notification.setShopContent(name);
-//            notification.setPorductID(productID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            productID="";
-//        }
-////械字号资质证书7日后过期
-//        for (int i=0;i<pro2.size();i++){
-//
-//            MessageCenter messageCenter = new MessageCenter();
-//            messageCenter.setShopId(pro2.get(i).getShopID());
-//            messageCenter.setClubId(null);
-//            messageCenter.setUserType(2);
-//            messageCenter.setMessageType(2);
-//            messageCenter.setShopMessType(5);
-//            messageCenter.setContent("该商品的资质证书将于7天后失效，请及时登录采美网站上传新证书。");
-//            messageCenter.setTime(curDateStr);
-//            messageCenterDao.addMessageCenter(messageCenter);
-//            if(i!=0){
-//                name+=",";
-//                productID+=",";
-//            }
-//            name +="("+pro2.get(i).getProductID().toString()+")"+pro.get(i).getName();
-//            productID+=pro2.get(i).getProductID().toString();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下械字号商品的资质证书将于7天后失效，请及时提醒供应商更换证书。");
-//            notification.setShopContent(name);
-//            notification.setPorductID(productID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            productID="";
-//        }
-////械字号资质证书今日后过期
-//        for (int i=0;i<pro3.size();i++){
-//            MessageCenter messageCenter = new MessageCenter();
-//            messageCenter.setShopId(pro3.get(i).getShopID());
-//            messageCenter.setClubId(null);
-//            messageCenter.setUserType(2);
-//            messageCenter.setMessageType(2);
-//            messageCenter.setShopMessType(5);
-//            messageCenter.setContent("该商品的资质证书将于今天后失效，请及时登录采美网站上传新证书。");
-//            messageCenter.setTime(curDateStr);
-//            messageCenterDao.addMessageCenter(messageCenter);
-//            if(i!=0){
-//                name+=",";
-//                productID+=",";
-//            }
-//            name +="("+pro3.get(i).getProductID().toString()+")"+pro.get(i).getName();
-//            productID+=pro3.get(i).getProductID().toString();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下械字号商品的资质证书将于今天后失效，请及时提醒供应商更换证书。");
-//            notification.setShopContent(name);
-//            notification.setPorductID(productID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            productID="";
-//        }
-//        //上架费
-//        for (int i=0;i<product.size();i++){
-//            if(i!=0){
-//                name+=",";
-//                shopID+=",";
-//            }
-//            name +=product.get(i).getShopName();
-//            shopID+=product.get(i).getShopID();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下供应商的上架费将于3个月后到期，请及时提醒供应商续费。");
-//            notification.setShopContent(name);
-//            notification.setShopID(shopID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            shopID="";
-//        }
-//        //上架费1个月后过期
-//        for (int i=0;i<product1.size();i++){
-//            if(i!=0){
-//                name+=",";
-//                shopID+=",";
-//            }
-//            name +=product1.get(i).getShopName();
-//            shopID+=product1.get(i).getShopID();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下供应商的上架费将于1个月后到期，请及时提醒供应商续费。");
-//            notification.setShopContent(name);
-//            notification.setShopID(shopID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            shopID="";
-//        }
-////上架费7日后过期
-//        for (int i=0;i<product2.size();i++){
-//            if(i!=0){
-//                name+=",";
-//                shopID+=",";
-//            }
-//            name +=product2.get(i).getShopName();
-//            shopID+=product2.get(i).getShopID();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下供应商的上架费将于7天后到期，请及时提醒供应商续费。");
-//            notification.setShopContent(name);
-//            notification.setShopID(shopID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            shopID="";
-//        }
-////上架费今日后过期
-//        for (int i=0;i<product3.size();i++){
-//            if(i!=0){
-//                name+=",";
-//                shopID+=",";
-//            }
-//            name +=product3.get(i).getShopName();
-//            shopID+=product3.get(i).getShopID();
-//        }
-//        if(!"".equals(name)){
-//            Notification notification=new Notification();
-//            notification.setTheme("以下供应商的上架费将于今天后到期，请及时提醒供应商续费。");
-//            notification.setShopContent(name);
-//            notification.setShopID(shopID);
-//            notificationDao.addNotification(notification);
-//            name="";
-//            shopID="";
-//        }
-//      }
-//        jedis.lpush("constraint","1");
       List<String> content=new ArrayList<>();
         Page<Notification> page = notificationService.notificationPagen(new Page<Notification>(request, response), notifi);
 
@@ -504,9 +282,9 @@ if(count<=0){
         notificationDao.hides();
         return "redirect:"+Global.getAdminPath()+"/sys/Notification/list";
     }
-    @Scheduled(cron = "0 0 11 * * ?")
-//@Scheduled(cron = "0 0/3 * * * ?")
-    public void time(){
+//    @Scheduled(cron = "0 0 11 * * ?")
+@Scheduled(cron = "0 0/1 * * * ?")
+    public void nottime(){
         logger.info("》》》》》》》》》》》开始检测商品资质证书和上架费是否过期");
 
         //械字号资质证书3个月后过期
@@ -663,7 +441,7 @@ if(count<=0){
                     name+=",";
                     shopID+=",";
                 }
-                name +=product.get(i).getShopName();
+                name +=product.get(i).getName();
                 shopID+=product.get(i).getShopID();
             }
             if(!"".equals(name)){
@@ -681,7 +459,7 @@ if(count<=0){
                     name+=",";
                     shopID+=",";
                 }
-                name +=product1.get(i).getShopName();
+                name +=product1.get(i).getName();
                 shopID+=product1.get(i).getShopID();
             }
             if(!"".equals(name)){
@@ -699,7 +477,7 @@ if(count<=0){
                     name+=",";
                     shopID+=",";
                 }
-                name +=product2.get(i).getShopName();
+                name +=product2.get(i).getName();
                 shopID+=product2.get(i).getShopID();
             }
             if(!"".equals(name)){
@@ -717,7 +495,7 @@ if(count<=0){
                     name+=",";
                     shopID+=",";
                 }
-                name +=product3.get(i).getShopName();
+                name +=product3.get(i).getName();
                 shopID+=product3.get(i).getShopID();
             }
             if(!"".equals(name)){

src/main/webapp/WEB-INF/views/modules/userNew/ReportList.jsp

@@ -422,7 +422,7 @@
                 console.log(data.success)
                 console.log(true == data.success)
                 if (true == data.success) {
-                    $.jBox.confirm("该报备未关联任何咨询记录，无需审核。", "提示") ;
+                    $.jBox.prompt("该报备未关联任何咨询记录，无需审核。", "提示") ;
 
                 }else {
                     location.reload()
@@ -434,11 +434,13 @@
 
     function audit(auditText){
         console.log(111)
-        var html = "<div id='auditBox'>"
-            + "   <div class='bd-row'>"
+        var html = "<div  id='auditBox'>"
+            + "   <div style='white-space:normal; word-break:break-all;overflow:hidden;' class='bd-row'>"
             +   auditText
             + "   </div>";
-        $.jBox.confirm(html,"备注");
+
+        var d=auditText
+        $.jBox.prompt(html,"备注");
     }
 
 function deleteReport(reportId){
@@ -454,7 +456,7 @@ function deleteReport(reportId){
                 location.reload()
             }
             if(false == data.success) {
-                $.jBox.confirm("请将该报备关联的全部咨询记录取消关联后再删除","提示");
+                $.jBox.prompt("请将该报备关联的全部咨询记录取消关联后再删除","提示");
             }
         }, "JSON");//这里返回的类型有：json,html,xml,text
              }