更新

app-api/src/main/java/com/hboxs/control/api/equipment/CleanController.java

@@ -1,30 +1,34 @@
 package com.hboxs.control.api.equipment;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.hboxs.ViewObject.AlarmRecordVo;
 import com.hboxs.common.JsonMessage;
 import com.hboxs.common.utils.MailUtil;
 import com.hboxs.common.utils.YunPianSms;
 import com.hboxs.control.api.BaseController;
-import com.hboxs.entity.Admin;
-import com.hboxs.entity.AlarmRecord;
-import com.hboxs.entity.CleanHistory;
-import com.hboxs.entity.Equipment;
-import com.hboxs.service.AdminService;
-import com.hboxs.service.AlarmRecordService;
-import com.hboxs.service.CleanHistoryService;
-import com.hboxs.service.EquipmentService;
+import com.hboxs.entity.*;
+import com.hboxs.service.*;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Base64;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Random;
 
 @Controller("appCleanController")
 @RequestMapping("/api/app_alarmRecord/clean")
@@ -39,6 +43,8 @@ public class CleanController extends BaseController {
     @Resource(name = "cleanHistoryServiceImpl")
     private CleanHistoryService cleanHistoryService;
 
+    @Resource(name = "signServiceImpl")
+    private SignService signService;
     @Resource(name = "adminServiceImpl")
     private AdminService adminService;
     private static final String appid = "07784f5fedb508046c841b391005b7de";
@@ -376,4 +382,49 @@ public class CleanController extends BaseController {
          return JsonMessage.success(sformat.format(date));
     }
 
+    /**
+     * 获取签到二维码
+     */
+    @RequestMapping(value = "/getCode", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public Object getCode(String clientId) throws IOException, WriterException{
+        if(StringUtils.isEmpty(clientId)){
+            return  JsonMessage.error("设备号为空！");
+        }
+        StringBuilder number = new StringBuilder();
+        Random random = new Random();
+        /**
+         * 6位随机
+         */
+        for (int i = 0; i < 6; i++) {
+            number.append(String.valueOf(random.nextInt(10)));
+        }
+        String code = number.toString();
+        QRCodeWriter qrCodeWriter = new QRCodeWriter();
+
+        HashMap<EncodeHintType, Object> hints = new HashMap<>();
+        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
+
+        BitMatrix bitMatrix = qrCodeWriter.encode(code, BarcodeFormat.QR_CODE, 600, 600, hints);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream);
+        Base64.Encoder encoder = Base64.getEncoder();
+        String text = encoder.encodeToString(outputStream.toByteArray());
+        if(!StringUtils.isEmpty(text)){
+            Equipment equipment = equipmentService.findByClientId(clientId);
+            Long adminId = equipment.getAdminId();
+            if(adminId==null){
+                return  JsonMessage.error("设备号错误！");
+            }
+            Sign sign = new Sign();
+            sign.setClientId(clientId);
+            sign.setStatus("0");
+            sign.setCode(code);
+            sign.setAdminId(adminId);
+            signService.save(sign);
+        }
+        JSONObject kindData = new JSONObject();
+        kindData.put("rd_Pic","data:image/png;base64,"+text);
+        return JsonMessage.success(kindData.toString());
+    }
 }

app-api/src/main/java/com/hboxs/control/api/order/CoinOrderController.java

@@ -71,7 +71,8 @@ public class CoinOrderController extends BaseController {
         customerContact.put("customerEmail", "520283710@qq.com");
         customerContact.put("customerMobile", "9910215225");
         body.put("customerContact", customerContact);
-        body.put("statusCallbackUrl", "http://app.sunzee.com.cn/api/order/paytmNotify.htm");
+        body.put("statusCallbackUrl", "http://clean.sunzee.com.cn/api/order/paytmNotify.htm");
+//        body.put("statusCallbackUrl", "http://slb.sunzee.com.cn/api/order/paytmNotify.htm");
         body.put("mid", "WorldP64425807474247");
 
         /* Possible value are "GENERIC", "FIXED", "INVOICE" */

app-api/src/main/java/com/hboxs/control/api/order/OrderController.java

@@ -83,6 +83,7 @@ public class OrderController extends BaseController {
         customerContact.put("customerMobile", "9910215225");
         body.put("customerContact", customerContact);
         body.put("statusCallbackUrl", "http://app.sunzee.com.cn/api/order/paytmNotify.htm");
+//        body.put("statusCallbackUrl", "http://slb.sunzee.com.cn/api/order/paytmNotify.htm");
         body.put("mid", "WorldP64425807474247");
 
         /* Possible value are "GENERIC", "FIXED", "INVOICE" */

app-backend-web/src/main/java/com/hboxs/control/admin/AdminAgencyController.java

@@ -87,7 +87,8 @@ public class AdminAgencyController extends BaseController {
 
 
         CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "localhost");
-        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "app.sunzee.com.cn");
+//        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "app.sunzee.com.cn");
+        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "clean.sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "sunzee.com.cn");
 
         CookieUtils.addCookie(request ,response , "type" , "agency");

app-backend-web/src/main/java/com/hboxs/control/admin/AdminMerchantController.java

@@ -88,10 +88,12 @@ public class AdminMerchantController extends BaseController {
                         null, "merchant", AdminUtils.encrypt(true, merchant.getAgencyId()), false, null);
 
         CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "localhost");
-        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "app.sunzee.com.cn");
+//        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "app.sunzee.com.cn");
+        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "clean.sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "localhost");
-        CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "app.sunzee.com.cn");
+//        CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "app.sunzee.com.cn");
+        CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "clean.sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "sunzee.com.cn");
 
         CookieUtils.addCookie(request ,response , "type" , "merchant");

app-backend-web/src/main/java/com/hboxs/control/admin/AdminPersonageController.java

@@ -87,10 +87,12 @@ public class AdminPersonageController extends BaseController {
                         null, "personage", AdminUtils.encrypt(true, personage.getMerchantId()), false, null);
 
         CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "localhost");
-        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "app.sunzee.com.cn");
+//        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "app.sunzee.com.cn");
+        CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "clean.sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "type" , "/asl-admin" , "sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "localhost");
-        CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "app.sunzee.com.cn");
+//        CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "app.sunzee.com.cn");
+        CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "clean.sunzee.com.cn");
         CookieUtils.removeCookie(request ,response , "p" , "/asl-admin" , "sunzee.com.cn");
 
         CookieUtils.addCookie(request ,response , "type" , "personage");

app-backend-web/src/main/java/com/hboxs/control/admin/SignController.java

@@ -0,0 +1,23 @@
+package com.hboxs.control.admin;
+
+import com.hboxs.service.BoxService;
+import com.hboxs.service.SignService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+
+/**
+ * Controller -
+ */
+@Controller("adminSignController")
+@RequestMapping("/asl-admin/box")
+public class SignController extends BaseController {
+
+    @Resource(name = "signServiceImpl")
+    private SignService signService;
+
+
+
+
+}

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminAgency/list.ftl

@@ -21,7 +21,7 @@ $().ready(function() {
 </head>
 <body>
 	<div class="path">
-        首页 &raquo; 省级管理 <span>(总共${page.total}行) <a class="login-url"> 省级登陆链接：http://app.sunzee.com.cn/asl-admin/login.jsp?type=agency</a>（复制给省级登陆）</span>
+        首页 &raquo; 省级管理 <span>(总共${page.total}行) <a class="login-url"> 省级登陆链接：http://clean.sunzee.com.cn/asl-admin/login.jsp?type=agency</a>（复制给省级登陆）</span>
 	</div>
 	<form id="listForm" action="list.htm" method="get">
 		<div class="bar">

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminMerchant/list.ftl

@@ -21,7 +21,7 @@ $().ready(function() {
 </head>
 <body>
 	<div class="path">
-        首页 &raquo; 市级管理 <span>(总共${page.total}行) <a class="login-url"> 市级登陆链接：http://app.sunzee.com.cn/asl-admin/login.jsp?type=merchant</a>（复制给市级登陆）</span>
+        首页 &raquo; 市级管理 <span>(总共${page.total}行) <a class="login-url"> 市级登陆链接：http://clean.sunzee.com.cn/asl-admin/login.jsp?type=merchant</a>（复制给市级登陆）</span>
 	</div>
 	<form id="listForm" action="list.htm" method="get">
 		<div class="bar">

app-backend-web/src/main/webapp/WEB-INF/template/admin/adminPersonage/list.ftl

@@ -22,7 +22,7 @@ $().ready(function() {
 </head>
 <body>
 	<div class="path">
-        首页 &raquo; 终端管理 <span>(总共${page.total}行) <a class="login-url">终端登陆链接：http://app.sunzee.com.cn/asl-admin/login.jsp?type=personage</a>（复制给终端登陆）</span>
+        首页 &raquo; 终端管理 <span>(总共${page.total}行) <a class="login-url">终端登陆链接：http://clean.sunzee.com.cn/asl-admin/login.jsp?type=personage</a>（复制给终端登陆）</span>
 	</div>
 	<form id="listForm" action="list.htm" method="get">
 		<div class="bar">

app-backend-web/src/main/webapp/WEB-INF/template/admin/common/index.ftl

@@ -162,7 +162,7 @@
                         <div class="infoPie2" style="min-height: 125px;">
                             <ul class="clearfix">
                                 <li class="color-zi">
-                                    <span id="odorConcentration" class="border-zi">0%</span>
+                                    <span id="odorConcentration" class="border-zi">0</span>
                                     <p>气味浓度</p>
                                 </li>
                                 <li  class="color-blue">
@@ -173,10 +173,10 @@
                                     <span id="cabinetHd" class="border-yellow">0%</span>
                                     <p>湿度</p>
                                 </li>
-                                <li class="color-green">
-                                    <span class="border-green">89%</span>
-                                    <p>环境舒适度</p>
-                                </li>
+                                <#--<li class="color-green">-->
+                                    <#--<span class="border-green">89%</span>-->
+                                    <#--<p>环境舒适度</p>-->
+                                <#--</li>-->
                             </ul>
                         </div>
                     </div>

app-backend-web/src/main/webapp/WEB-INF/template/admin/common/indexOld.ftl

@@ -76,16 +76,16 @@
             <td class="managerId">${admin.managerId} （设备初始化使用）</td>
         [#if admin.type=="admin"]
             <td>省级登陆链接</td>
-            <td class="url">http://app.sunzee.com.cn/asl-admin/login.jsp?type=agency</td>
+            <td class="url">http://clean.sunzee.com.cn/asl-admin/login.jsp?type=agency</td>
         [#elseif admin.type=="agency"]
             <td>经销商登陆链接</td>
-            <td class="url">http://app.sunzee.com.cn/asl-admin/login.jsp?type=merchant&p=${admin.agencyUid}</td>
+            <td class="url">http://clean.sunzee.com.cn/asl-admin/login.jsp?type=merchant&p=${admin.agencyUid}</td>
         [#elseif admin.type=="merchant"]
             <td>终端登陆链接</td>
-            <td class="url">http://app.sunzee.com.cn/asl-admin/login.jsp?type=personage&p=${admin.merchantUid}</td>
+            <td class="url">http://clean.sunzee.com.cn/asl-admin/login.jsp?type=personage&p=${admin.merchantUid}</td>
         [#elseif admin.type=="personage"]
             <td>我的登陆链接</td>
-            <td class="url">http://app.sunzee.com.cn/asl-admin/login.jsp?type=personage&p=${admin.merchantUid}</td>
+            <td class="url">http://clean.sunzee.com.cn/asl-admin/login.jsp?type=personage&p=${admin.merchantUid}</td>
         [/#if]
             </tr>
     </table>

app-backend-web/src/main/webapp/resources/index/js/scanboard.js

@@ -355,7 +355,7 @@ $(function(){
             if(i==0){
                 option.selected = true;
                 option1.selected = true;
-                odorConcentration.innerHTML =equipmentList[0].odorConcentration+"%";
+                odorConcentration.innerHTML =equipmentList[0].odorConcentration+"ppm";
                 cabinetTm.innerHTML =equipmentList[0].cabinetTm+"℃";
                 cabinetHd.innerHTML =equipmentList[0].cabinetHd+"%";
                 resource.innerHTML ='<div id="cleanerDiv" class="progress" progress="'+equipmentList[0].cleaner+'%">'+
@@ -805,7 +805,7 @@ $(function(){
                             shuxing.options[j].selected = true;
                         }
                     }
-                    odorConcentration.innerHTML = equipmentLists[i].odorConcentration + "%";
+                    odorConcentration.innerHTML = equipmentLists[i].odorConcentration + "ppm";
                     cabinetTm.innerHTML = equipmentLists[i].cabinetTm + "℃";
                     cabinetHd.innerHTML = equipmentLists[i].cabinetHd + "%";
                     val++;
@@ -978,7 +978,7 @@ function getEquipmentShuxing(name){
             var cabinetHd=window.document .getElementById ("cabinetHd");
             for(var i = 0;i < equipmentList.length; i++){
                 if(name==equipmentList[i].name) {
-                    odorConcentration.innerHTML = equipmentList[i].odorConcentration + "%";
+                    odorConcentration.innerHTML = equipmentList[i].odorConcentration + "ppm";
                     cabinetTm.innerHTML = equipmentList[i].cabinetTm + "℃";
                     cabinetHd.innerHTML = equipmentList[i].cabinetHd + "%";
                 }
@@ -1010,7 +1010,7 @@ function changeA() {
                         shuxing.options[j].selected = true;
                     }
                 }
-                odorConcentration.innerHTML = equipmentLis[i].odorConcentration + "%";
+                odorConcentration.innerHTML = equipmentLis[i].odorConcentration + "ppm";
                 cabinetTm.innerHTML = equipmentLis[i].cabinetTm + "℃";
                 cabinetHd.innerHTML = equipmentLis[i].cabinetHd + "%";
                 val++;

app-common/src/main/java/com/hboxs/common/JoinpayConstant.java

@@ -41,16 +41,20 @@ public class JoinpayConstant {
      *  支付成功回调
      */
     public final static String Notify_Url = "http://clean.sunzee.com.cn/api/order/payCleanNotify.htm";
+//    public final static String Notify_Url = "http://slb.sunzee.com.cn/api/order/payCleanNotify.htm";
 
+//    public final static String Card_Notify_Url = "http://slb.sunzee.com.cn/api/order/notify.htm";
     public final static String Card_Notify_Url = "http://clean.sunzee.com.cn/api/order/notify.htm";
 
-    public final static String Notify_Url_PromoCode = "http://app.sunzee.com.cn/api/order/promoCodeNotify.htm";
+    public final static String Notify_Url_PromoCode = "http://clean.sunzee.com.cn/api/order/promoCodeNotify.htm";
+//    public final static String Notify_Url_PromoCode = "http://slb.sunzee.com.cn/api/order/promoCodeNotify.htm";
 
     public final static Map<String,String> Result_status = new HashMap<>();
     /**
      *  退款成功回调
      */
-    public final static String Notify_Refund_Url = "http://app.sunzee.com.cn/api/order/notifyRefund.htm";
+    public final static String Notify_Refund_Url = "http://clean.sunzee.com.cn/api/order/notifyRefund.htm";
+//    public final static String Notify_Refund_Url = "http://slb.sunzee.com.cn/api/order/notifyRefund.htm";
 
 
     /**

app-dao/src/main/java/com/hboxs/dao/SignDao.java

@@ -0,0 +1,16 @@
+/*
+ *
+ *  ADDao
+ *
+ */
+package com.hboxs.dao;
+
+import com.hboxs.entity.Box;
+import com.hboxs.entity.Sign;
+
+/**
+ * Dao -
+ */
+public interface SignDao extends BaseDao<Sign, Long> {
+
+}

app-dao/src/main/java/com/hboxs/dao/impl/SignDaoImpl.java

@@ -0,0 +1,20 @@
+/*
+ *
+ *  ADDaoImpl
+ *
+ */
+package com.hboxs.dao.impl;
+
+import com.hboxs.dao.BoxDao;
+import com.hboxs.dao.SignDao;
+import com.hboxs.entity.Box;
+import com.hboxs.entity.Sign;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Dao -
+ */
+@Repository("signDaoImpl")
+public class SignDaoImpl extends BaseDaoImpl<Sign, Long> implements SignDao {
+
+}

app-entity/src/main/java/com/hboxs/entity/Sign.java

@@ -0,0 +1,105 @@
+package com.hboxs.entity;
+
+
+import javax.persistence.Entity;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Entity
+@Table(name = "t_sign")
+@SequenceGenerator(name = "sequenceGenerator", sequenceName = "t_sign_sequence")
+public class Sign extends BaseEntity {
+    private static final long serialVersionUID = -6613252029623957372L;
+    /**
+     * status(0,1)  clentId   work_name   create_date  pay_date  weixin_id
+     */
+
+
+    private String code;
+    /**
+     *
+     */
+    private String clientId;
+    /**
+     *
+     */
+    private Long adminId;
+
+    /**
+     *
+     */
+    private String workName;
+
+    /**
+     * 状态  0:创建状态 1：已签到
+     */
+    private String status;
+
+    /**
+     * 锁定日期
+     */
+    private Date payDate;
+
+    private Long weixinId;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getWorkName() {
+        return workName;
+    }
+
+    public void setWorkName(String workName) {
+        this.workName = workName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Long getAdminId() {
+        return adminId;
+    }
+
+    public void setAdminId(Long adminId) {
+        this.adminId = adminId;
+    }
+
+    public Date getPayDate() {
+        return payDate;
+    }
+
+    public void setPayDate(Date payDate) {
+        this.payDate = payDate;
+    }
+
+    public Long getWeixinId() {
+        return weixinId;
+    }
+
+    public void setWeixinId(Long weixinId) {
+        this.weixinId = weixinId;
+    }
+}

app-service/src/main/java/com/hboxs/service/SignService.java

@@ -0,0 +1,16 @@
+/*
+ *
+ * ADService
+ *
+ */
+package com.hboxs.service;
+
+import com.hboxs.entity.Box;
+import com.hboxs.entity.Sign;
+
+/**
+ * Service -
+ */
+public interface SignService extends BaseService<Sign, Long> {
+
+}

app-service/src/main/java/com/hboxs/service/impl/SignServiceImpl.java

@@ -0,0 +1,33 @@
+/*
+ *
+ *  ADServiceImpl
+ *
+ */
+package com.hboxs.service.impl;
+
+import com.hboxs.dao.BoxDao;
+import com.hboxs.dao.SignDao;
+import com.hboxs.entity.Box;
+import com.hboxs.entity.Sign;
+import com.hboxs.service.BoxService;
+import com.hboxs.service.SignService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Service -
+ */
+@Service("signServiceImpl")
+public class SignServiceImpl extends BaseServiceImpl<Sign, Long> implements SignService {
+
+    @Resource(name = "signDaoImpl")
+    private SignDao signDao;
+
+    @Resource(name = "signDaoImpl")
+    public void setBaseDao(SignDao signDao) {
+        super.setBaseDao(signDao);
+    }
+
+
+}

conf/default/system.properties

@@ -1,9 +1,15 @@
 ### System Properties
 ## DB Config
 # localhost connect url
-jdbc.url=jdbc\:mysql\://47.112.127.131\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
-jdbc.username=hboxs
-jdbc.password=hboxs@mysql
+#jdbc.url=jdbc\:mysql\://47.112.127.131\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
+#jdbc.url=jdbc\:mysql\://localhost\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
+#jdbc.username=hboxs
+#jdbc.password=hboxs@mysql
+## RDS连接库
+#内网
+jdbc.url=jdbc\:mysql\://rm-wz995mu26a1479kz0.mysql.rds.aliyuncs.com\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
+jdbc.username=root
+jdbc.password=sunzee@020
 jdbc.driver=com.mysql.jdbc.Driver
 ## Connection Pool Config
 connection_pools.min_pool_size=5

pom.xml

@@ -246,6 +246,17 @@
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.47</version>
         </dependency>
+        <!--生成二维码-->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.0</version>
+        </dependency>
         <!-- common-annotations.jar -->
         <dependency>
             <groupId>javax.annotation</groupId>