feat(service): 新增自助服务

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/JoyfulRichTextMapper.xml

@@ -89,6 +89,7 @@
             ,remark2
             ,remark3
             ,remark4
+            ,status
         FROM
             gksite.joyful_rich_text
         WHERE
@@ -97,7 +98,8 @@
 
     <select id="getJoyfulRichTextList" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulRichText">
         SELECT
-            title
+            id
+            ,title
             ,address
             ,lng
             ,lat
@@ -106,6 +108,8 @@
             ,remark2
             ,remark3
             ,remark4
+             ,type
+            ,status
         FROM
             gksite.joyful_rich_text
         WHERE

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/JoyfulRichTextService.java

@@ -7,6 +7,8 @@ import com.dlbridge.jadp.plugins.cmpt.utils.GpsUtil;
 import com.dlbridge.jadp.plugins.cmpt.utils.QRCodeUtil;
 import com.google.gson.Gson;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,6 +27,7 @@ import java.util.stream.Collectors;
 @Service
 public class JoyfulRichTextService {
 
+    private static final Logger log = LoggerFactory.getLogger(JoyfulRichTextService.class);
     @Resource
     JoyfulRichTextMapper joyfulRichTextMapper;
 

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/JoyfulRoadController.java

@@ -151,12 +151,13 @@ public class JoyfulRoadController {
     @PostMapping(value = "/getJoyfulRichTextList/{pageNo}/{pageCount}")
     @ApiOperation(value = "自助服务管理条件检索", notes = "自助服务管理条件检索", tags = "自助服务管理条件检索")
     public Result<List<JoyfulRichText>> getJoyfulRichTextList(@RequestBody JoyfulRichTextBean joyfulRichTextBean, @PathVariable("pageNo") int pageNo, @PathVariable("pageCount") int pageCount) {
-        if (StringUtils.isNotBlank(joyfulRichTextBean.getType())) {
-        } else if (StringUtils.isNotBlank(joyfulRichTextBean.getTitle())) {
-        } else if (StringUtils.isNotBlank(joyfulRichTextBean.getDistance()) && StringUtils.isNotBlank(joyfulRichTextBean.getLng()) && StringUtils.isNotBlank(joyfulRichTextBean.getLat())) {
-        } else {
-            return Result.fail().setMsg("请输入检索条件。");
-        }
+        // TODO 先注释
+        //if (StringUtils.isNotBlank(joyfulRichTextBean.getType())) {
+        //} else if (StringUtils.isNotBlank(joyfulRichTextBean.getTitle())) {
+        //} else if (StringUtils.isNotBlank(joyfulRichTextBean.getDistance()) && StringUtils.isNotBlank(joyfulRichTextBean.getLng()) && StringUtils.isNotBlank(joyfulRichTextBean.getLat())) {
+        //} else {
+        //    return Result.fail().setMsg("请输入检索条件。");
+        //}
         List<JoyfulRichText> joyfulRichTextList = joyfulRichTextService.getJoyfulRichTextList(joyfulRichTextBean);
         int fromIndex = pointService.getOffset(pageNo, pageCount);
         joyfulRichTextList = JoyfulRichTextService.subList(joyfulRichTextList, fromIndex, fromIndex + pageCount);

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/ServiceSettingController.java

+package com.dlbridge.jadp.plugins.cmpt.web;
+
+import com.dlbridge.jadp.common.interceptor.PageView;
+import com.dlbridge.jadp.plugins.cmpt.bean.CmptScoreRule;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptScoreRuleService;
+import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
+import com.dlbridge.jadp.plugins.cmpt.service.RemoteService;
+import com.neusoft.www.utils.web.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@Log4j2
+@RequestMapping("gk/service/")
+@ApiIgnore
+public class ServiceSettingController {
+
+    @Resource
+    private CmptService cmptService;
+
+    @RequestMapping("index/{cmptId}")
+    @PageView
+    public ModelAndView outterLink(@PathVariable("cmptId") Integer cmptId, ModelAndView mv) {
+        Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
+
+        mv.addObject("cmpt", cmpt);
+        mv.setViewName("cmpt/service");
+        return mv;
+    }
+
+}

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -291,6 +291,12 @@
                                 <span class="menu-txt">排行榜</span>
                             </a>
                         </li>
+                        <li class="service menu-sub-item">
+                            <a href="/gk/service/index/${cmpt.cmptId}?uId=${uId}&cId=${cId}&timestamp=${timestamp}&sign=${sign}">
+                                <span class="left-arrow"></span>
+                                <span class="menu-txt">自助服务</span>
+                            </a>
+                        </li>
                     </ul>
                     </li>
                 </ul>
@@ -348,7 +354,7 @@
     var classes = ['cmptSetting', 'nameList', 'manual', 'contact','manage',
                     'route', 'road', 'equip', 'photo', 'news','cert','data',
                     'banner','score','auto','scan','review','customer','rule',
-                    'outter-link','sure-letter','rankSetting'];
+                    'outter-link','sure-letter','rankSetting','service'];
     let url = document.location.href;
     var done = false;
     for (var i in classes) {

src/main/webapp/static/cmpt/score.css

-.section{
+.section {
     width: 1010px;
     background: white;
     padding: 20px 25px;
     margin: 10px 0px;
     position: relative;
 }
-.title{
+
+.title {
     font-size: 24px;
     color: #333;
     font-weight: normal;
@@ -13,24 +14,29 @@
     height: 50px;
     line-height: 50px;
 }
-.count-input{
+
+.count-input {
     width: 670px;
     height: 50px;
 }
-input{
-    background: rgba(247,247,247,1);
+
+input {
+    background: rgba(247, 247, 247, 1);
     border-radius: 4px;
-    border: 1px solid rgba(229,229,229,1);
+    border: 1px solid rgba(229, 229, 229, 1);
     padding-left: 7px;
 }
-.tip{
+
+.tip {
     font-size: 16px;
     color: #333;
-    margin-right: 10px;;
+    margin-right: 10px;
+    ;
 }
-.rule-item{
+
+.rule-item {
     border-radius: 4px;
-    border: 1px solid rgba(229,229,229,1);
+    border: 1px solid rgba(229, 229, 229, 1);
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -41,20 +47,24 @@ input{
     padding: 0px 10px;
     margin-top: 10px;
 }
-.search-group{
+
+.search-group {
     position: relative;
 }
-.search{
-    width:317px;
-    height:50px;
-    background:rgba(247,247,247,1);
-    border-radius:4px;
-    border:1px solid rgba(229,229,229,1);
+
+.search {
+    width: 317px;
+    height: 50px;
+    background: rgba(247, 247, 247, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(229, 229, 229, 1);
 }
-.clear{
+
+.clear {
     clear: both;
 }
-.search-btn{
+
+.search-btn {
     position: absolute;
     right: 0px;
     line-height: 50px;
@@ -68,22 +78,25 @@ input{
     border-radius: 0px 4px 4px 0pc;
     cursor: pointer;
 }
-thead tr th{
+
+thead tr th {
     font-size: 16px;
-    color:#999;
+    color: #999;
     height: 50px;
     line-height: 50px;
     font-weight: normal;
 }
-tbody tr td{
+
+tbody tr td {
     font-size: 20px;
-    color:#333;
+    color: #333;
     font-weight: 400;
 }
+
 .add-btn {
     width: 146px;
     height: 40px;
-    background: rgba(206,57,57,1);
+    background: rgba(206, 57, 57, 1);
     border-radius: 4px;
     color: white;
     position: absolute;
@@ -94,10 +107,11 @@ tbody tr td{
     align-items: center;
     cursor: pointer;
 }
-.deleteBtn{
+
+.deleteBtn {
     width: 146px;
     height: 40px;
-    background: rgba(206,57,57,1);
+    background: rgba(206, 57, 57, 1);
     border-radius: 4px;
     color: white;
     justify-content: center;
@@ -105,43 +119,55 @@ tbody tr td{
     align-items: center;
     cursor: pointer;
 }
-.rule-field{
+
+.rule-field {
     background: white;
 }
-.rule-field tr{
+
+.rule-field tr {
     height: 60px;
     line-height: 60px;
 }
-.rule-field tbody tr td:first-child{
+
+.rule-field tbody tr td:first-child {
     padding-left: 25px;
     height: 80px;
 }
-.rule-field tbody tr td:nth-child(2n){
+
+.rule-field tbody tr td:nth-child(2n) {
     text-align: center;
 }
-.rule-field tbody tr:nth-child(odd){
-    background:rgba(247,247,247,1);
+
+.rule-field tbody tr:nth-child(odd) {
+    background: rgba(247, 247, 247, 1);
 }
-.del, .edit {
+
+.del,
+.edit {
     height: 40px;
-    line-height: 40px;;
+    line-height: 40px;
+    ;
     font-size: 14px;
     margin-right: 0px;
 }
-.edit{
+
+.edit {
     color: #ce3939;
 }
-#score-body tr{
+
+#score-body tr {
     height: 60px;
 }
-.opt{
+
+.opt {
     display: flex;
     height: 60px;
     align-items: center;
     cursor: pointer;
     justify-content: center;
 }
-.rule-field .opt{
+
+.rule-field .opt {
     height: 40px;
 }
 
@@ -168,18 +194,22 @@ tbody tr td{
     margin-right: 8px;
     margin-top: -9px;
 }
-.line-tr{
-    background: rgba(247,247,247,1);
+
+.line-tr {
+    background: rgba(247, 247, 247, 1);
     height: 60px;
-    border-bottom: 2px rgba(229,229,229,1) solid;
+    border-bottom: 2px rgba(229, 229, 229, 1) solid;
 }
-.line-tr:last-child{
+
+.line-tr:last-child {
     border-bottom: none;
 }
-label{
+
+label {
     margin-bottom: 0px;
 }
-.save-btn{
+
+.save-btn {
     color: white;
     background: #ce3939;
     display: inline-block;
@@ -190,21 +220,24 @@ label{
     cursor: pointer;
     width: 146px;
     height: 40px;
-    background: rgba(206,57,57,1);
+    background: rgba(206, 57, 57, 1);
     border-radius: 4px;
     float: right;
     margin-right: 16px;
 }
-.input-group{
+
+.input-group {
     position: relative;
     width: 170px;
 }
-.time-input{
+
+.time-input {
     width: 170px;
     height: 38px;
     cursor: pointer;
 }
-.down-arrow{
+
+.down-arrow {
     width: 18px;
     height: 10px;
     display: inline-block;
@@ -216,13 +249,15 @@ label{
     right: 86px;
     background-size: contain;
 }
-.line{
+
+.line {
     width: 50px;
     height: 1px;
     background: #E5E5E5;
     margin: 0px 10px;
 }
-.export{
+
+.export {
     width: 146px;
     height: 40px;
     background: #ce3939;
@@ -236,27 +271,30 @@ label{
     border-radius: 4px;
     cursor: pointer;
 }
-.mask{
+
+.mask {
     width: 100%;
     height: 100%;
     position: fixed;
     left: 0px;
     top: 0px;
-    background: rgba(0,0,0,0.3);
+    background: rgba(0, 0, 0, 0.3);
     z-index: 99;
     display: none;
 }
-.maskErr{
+
+.maskErr {
     width: 100%;
     height: 100%;
     position: fixed;
     left: 0px;
     top: 0px;
-    background: rgba(0,0,0,0.3);
+    background: rgba(0, 0, 0, 0.3);
     z-index: 99;
     display: none;
 }
-.dialog{
+
+.dialog {
     padding: 30px 40px;
     height: 300px;
     width: 680px;
@@ -267,40 +305,46 @@ label{
     position: absolute;
     background: white;
 }
-.dialog h3{
-    width:138px;
-    height:30px;
-    font-size:22px;
-    font-weight:400;
-    color:rgba(206,57,57,1);
-    line-height:30px;
-}
-.dialog input{
-    width:610px;
-    height:50px;
-    background:rgba(247,247,247,1);
-    border-radius:4px;
-    border:1px solid rgba(229,229,229,1);
-}
-.btn{
+
+.dialog h3 {
+    width: 138px;
+    height: 30px;
+    font-size: 22px;
+    font-weight: 400;
+    color: rgba(206, 57, 57, 1);
+    line-height: 30px;
+}
+
+.dialog input {
+    width: 610px;
+    height: 50px;
+    background: rgba(247, 247, 247, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(229, 229, 229, 1);
+}
+
+.btn {
     color: white;
     cursor: pointer;
-    font-size: 20px;
+    /* font-size: 20px; */
+}
+
+.cancel {
+    width: 146px;
+    height: 42px;
+    background: rgba(148, 148, 148, 1);
+    border-radius: 4px;
 }
-.cancel{
-    width:146px;
-    height:42px;
-    background:rgba(148,148,148,1);
-    border-radius:4px;
-}
-.sure{
-    width:146px;
-    height:42px;
-    background:rgba(206,57,57,1);
-    border-radius:4px;
+
+.sure {
+    width: 146px;
+    height: 42px;
+    background: rgba(206, 57, 57, 1);
+    border-radius: 4px;
     margin-left: 20px;
 }
-.extra-item{
+
+.extra-item {
     height: 80px;
     display: flex;
     justify-content: space-between;