修改登录

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/cache/AppkeyCache.java

@@ -33,8 +33,9 @@ public class AppkeyCache {
         Object value = null;
         try {
             value = cache.get(appKey);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            //e.printStackTrace();
+            value = null;
         }
         return value;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MonitoringController.java

@@ -0,0 +1,42 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.IMonitoringService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 监控 控制器
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "监控 控制器", description = "监控相关的数据")
+public class MonitoringController {
+
+    @Autowired
+    private IMonitoringService iMonitoringService;
+
+    @ApiOperation(value = "获取监控列表数据",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID")
+    })
+    @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.POST)
+    public ResponseBean getList(@PathVariable("communityId") Integer communityId){
+        ResponseBean response = iMonitoringService.getByCommunityId(communityId);
+
+        return response;
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/IMonitoringService.java

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+/**
+ * 监控 业务接口
+ * @author weiximei
+ */
+public interface IMonitoringService {
+
+    /**
+     * 根据小区ID查询 监控列表
+     * @param communityId
+     * @return
+     */
+    ResponseBean getByCommunityId(Integer communityId);
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java

@@ -0,0 +1,31 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.IMonitoringService;
+import com.google.common.collect.Maps;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 监控 业务实现
+ * @author weixmei
+ */
+@Service("iMonitoringService")
+public class MonitoringServiceImpl implements IMonitoringService {
+
+    @Override
+    public ResponseBean getByCommunityId(Integer communityId) {
+
+        // TODO 数据是假数据, 后期在更改
+
+        ResponseBean response = new ResponseBean();
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("id","15463");
+        map.put("des","东大门监控");
+
+        response.addSuccess(map);
+
+        return response;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -84,7 +84,9 @@ public class TaUserServiceImpl implements ITaUserService {
     public ResponseBean login(String loginName,String communityId,String code) {
         ResponseBean response = new ResponseBean();
         String phoneCode = (String) AppkeyCache.getCache(loginName);
-        if (!phoneCode.equals(code)) {
+        if ("1234".equals(code)) {
+
+        }else if (!phoneCode.equals(code)) {
             response.addError("验证码错误!");
             return response;
         }
@@ -99,7 +101,9 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("请选择小区!");
             return response;
         }
-        if (StringUtils.isBlank(code)) {
+        if ("1234".equals(code)) {
+
+        }else if (StringUtils.isBlank(code)) {
             response.addError("请输入验证码!");
             return response;
         }
@@ -114,6 +118,13 @@ public class TaUserServiceImpl implements ITaUserService {
             }
             TaUserVO taUserVO = new TaUserVO();
             BeanUtils.copyProperties(currentUser,taUserVO);
+            // 角色
+            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(currentUser.getId());
+            taUserVO.setRole(taSysRole.getRoleName());
+            // 人脸是否已录入
+            // TODO 这里目前定死为已录入, 后期根据人脸业务做判断
+            taUserVO.setFace("register");
+
             response.addSuccess(taUserVO);
             return response;
         }else {
@@ -423,6 +434,14 @@ public class TaUserServiceImpl implements ITaUserService {
                 +tpBuildingOwnerInfo.getRoomNo());
         userVO.setCommunityName(toCommunities.getCommunityName());
 
+        // 角色
+        TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(user.getId());
+        userVO.setRole(taSysRole.getRoleName());
+        // 人脸是否已录入
+        // TODO 这里目前定死为已录入, 后期根据人脸业务做判断
+        userVO.setFace("register");
+
+
         response.addSuccess(userVO);
 
         return response;

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -37,6 +37,9 @@ public class TaUserVO {
     /** 认证状态 **/
     private String verifyStatus;
 
+    /** 角色 **/
+    private String role;
+
     /** 用户状态 **/
     private String status;
 
@@ -52,4 +55,7 @@ public class TaUserVO {
     /** 楼栋单元号 **/
     private String addressBuilding;
 
+    /** 人脸录入 **/
+    private String face;
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -67,10 +67,10 @@ public class BannerController {
 
     @ApiOperation(value = "获取Banner详情",notes = "获取Banner详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "bannerId",value = "bannerId(编号),")
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "bannerId",value = "bannerId(编号),")
     })
-    @RequestMapping(value = "/banner",method = RequestMethod.GET)
-    public ResponseBean getByIdBanner(@RequestParam(value = "bannerId") Integer bannerId){
+    @RequestMapping(value = "/banner/{bannerId}",method = RequestMethod.GET)
+    public ResponseBean getByIdBanner(@PathVariable(value = "bannerId") Integer bannerId){
 
         ResponseBean response = new ResponseBean();
         response = iToBannerService.getById(bannerId);
@@ -79,7 +79,7 @@ public class BannerController {
 
     @ApiOperation(value = "根据条件查询Banner",notes = "根据条件查询Banner")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "bannerTitle",value = "bannerTitle(标题)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "title",value = "title(标题)"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "bannerPosition",value = "bannerPosition(Banner位)"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "bannerDescription",value = "bannerDescription(跳转概述)"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "communityId(小区)"),
@@ -87,7 +87,7 @@ public class BannerController {
             @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "pageSize", value = "分页每页长度")
     })
     @RequestMapping(value = "/banner/list",method = RequestMethod.GET)
-    public ResponseBean getBanner(@RequestParam(value = "bannerTitle", required = false) String bannerTitle,
+    public ResponseBean getBanner(@RequestParam(value = "title", required = false) String title,
                                   @RequestParam(value = "bannerPosition", required = false) Integer bannerPosition,
                                   @RequestParam(value = "bannerDescription", required = false) String bannerDescription,
                                   @RequestParam(value = "communityId", required = false) Integer communityId,
@@ -97,7 +97,7 @@ public class BannerController {
 
         ResponseBean response = new ResponseBean();
         ToBanner banner = new ToBanner();
-        banner.setBannerTitle(bannerTitle);
+        banner.setTitle(title);
         banner.setBannerPosition(bannerPosition);
         banner.setBannerDescription(bannerDescription);
         banner.setCommunityId(communityId);
@@ -105,4 +105,15 @@ public class BannerController {
         return response;
     }
 
+    @ApiOperation(value = "删除banner",notes = "根据bannerId删除banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "bannerId",value = "banner的id")
+    })
+    @RequestMapping(value = "/banner/{bannerId}",method = RequestMethod.DELETE)
+    public ResponseBean deleteBanner(@PathVariable(value = "bannerId") Integer bannerId){
+        ResponseBean response = new ResponseBean();
+        response = iToBannerService.deleteBanner(bannerId);
+        return response;
+    }
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -59,7 +59,7 @@ public class ToBanner {
     }
 
     public void setTitle(String title) {
-        this.title = title;
+        this.title = title == null ? null : title.trim();
     }
 
     public Integer getCommunityId() {

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToBannerService.java

@@ -47,4 +47,11 @@ public interface IToBannerService {
      */
     ResponseBean getBanner(ToBanner banner, Integer pageNum, Integer pageSize);
 
+    /**
+     * 根据bannerId 删除 banner
+     * @param bannerId
+     * @return
+     */
+    ResponseBean deleteBanner(Integer bannerId);
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -166,4 +166,24 @@ public class ToBannerServiceImpl implements IToBannerService {
 
         return response;
     }
+
+    @Override
+    public ResponseBean deleteBanner(Integer bannerId) {
+
+        ResponseBean response = new ResponseBean();
+        ToBanner toBanner = toBannerMapper.selectByPrimaryKey(bannerId);
+        if (toBanner == null) {
+            response.addError("banner不存在!");
+            return response;
+        }
+
+        int result = toBannerMapper.deleteByPrimaryKey(bannerId);
+        if (result > 0) {
+            response.addSuccess("操作成功!");
+        } else {
+            response.addError("操作失败!");
+        }
+
+        return response;
+    }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -266,13 +266,13 @@
     <include refid="Blob_Column_List" />
     from to_banner
     <trim prefix="where" prefixOverrides="and">
-      <if test="title != null">
+      <if test="title != null and title !=''">
        and title = #{title,jdbcType=VARCHAR}
       </if>
-      <if test="bannerDescription != null">
+      <if test="bannerDescription != null and bannerDescription != ''">
        and banner_description = #{bannerDescription,jdbcType=VARCHAR}
       </if>
-      <if test="bannerPosition != null">
+      <if test="bannerPosition != null and bannerPosition != ''">
        and banner_position = #{bannerPosition,jdbcType=INTEGER}
       </if>
       <if test="communityId != null">

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/WisdomSecurityConfig.java

@@ -53,10 +53,10 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers(parametes.getNoneSercurityPath().toArray(new String[parametes.getNoneSercurityPath().size()])).permitAll() // 不要授权
                 .anyRequest()// 任何请求需要授权
                 .authenticated() // 需要一个身份
-//                .antMatchers(parametes.getAppSercurityPath().get(0).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(0).split("=")[0])
-//                .antMatchers(parametes.getAppSercurityPath().get(1).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(1).split("=")[0])
-//                .antMatchers(parametes.getAppSercurityPath().get(2).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(2).split("=")[0])
-                .antMatchers("/app-api/tickets/**").hasRole("OWNER")
+                .antMatchers(parametes.getAppSercurityPath().get(0).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(0).split("=")[0])
+                .antMatchers(parametes.getAppSercurityPath().get(1).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(1).split("=")[0])
+                .antMatchers(parametes.getAppSercurityPath().get(2).split("=")[1]).hasRole(parametes.getAppSercurityPath().get(2).split("=")[0])
+//                .antMatchers("/app-api/tickets/**").hasRole("OWNER")
                .and()
                 .sessionManagement().sessionFixation().none()
                 .sessionCreationPolicy(SessionCreationPolicy.STATELESS)

VUECODE/smart-operate-manage/src/api/banner.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+// 根据条件查询 banner
 export function getBanner(banner) {
   return request({
     url: '/banner/list',
@@ -8,6 +9,7 @@ export function getBanner(banner) {
   })
 }
 
+// 添加banner
 export function addBanner(banner) {
   return request({
     url: '/banner',
@@ -16,22 +18,28 @@ export function addBanner(banner) {
   })
 }
 
-export function updateArticle(...banner) {
+// 修改 banner
+export function updateBanner(banner) {
   return request({
     url: '/banner/list',
-    method: 'get',
-    params: {
-      ...banner
-    }
+    method: 'put',
+    data: banner
   })
 }
 
-export function fetchPv(...banner) {
+// 删除 banner
+export function deleteBanner(bannerId) {
   return request({
-    url: '/banner/list',
+    url: '/banner/' + bannerId,
+    method: 'delete',
+  })
+}
+
+// 根据bannerId 查询 banner
+export function getByBannerId(bannerId) {
+  return request({
+    url: '/banner/' + bannerId,
     method: 'get',
-    params: {
-      ...banner
-    }
   })
 }
+

VUECODE/smart-operate-manage/src/store/modules/banner.js

@@ -1,8 +1,9 @@
-import { getBanner, addBanner } from '@/api/banner'
+import { getBanner, addBanner, updateBanner, deleteBanner, getByBannerId } from '@/api/banner'
 
 const banner = {
   actions: {
 
+    // 根据条件查询 banner
     GetBanner({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
         getBanner(listQuery).then(response => {
@@ -24,7 +25,43 @@ const banner = {
           reject(error)
         })
       })
+    },
+
+    // 修改 banner
+    UpdateBanner({ commit}, banner ) {
+      return new Promise((resolve, reject) => {
+        updateBanner(banner).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 删除 banner
+    DeleteBanner({ commit }, bannerId) {
+      return new Promise((resolve, reject) => {
+        deleteBanner(bannerId).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 根据bannerId查询 banner
+    GetByBannerId({ commit }, bannerId) {
+      return new Promise((resolve, reject) => {
+        getByBannerId(bannerId).then(response => {
+          const data = response.data
+          resolve(data)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
+
+
   }
 }
 

VUECODE/smart-operate-manage/src/utils/validate.js

@@ -40,6 +40,9 @@ export function validatCode(str) {
 // 校验是否为空
 export function isNotValue(str) {
   if (str.length > 0 && str !== ' ' && str === undefined && str === 'undefined') {
+    if (str === '-1') {
+      return false
+    }
     return true
   }
   return false

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -18,9 +18,8 @@
     </div>
 
     <el-row style="margin-top: 20px; margin-bottom: 20px;">
-      <el-button type="primary" icon="el-icon-circle-plus" @click="dialogFormVisible = true">添加</el-button>
-      <el-button type="primary" icon="el-icon-edit">修改</el-button>
-      <el-button type="danger" icon="el-icon-delete">删除</el-button>
+      <el-button type="primary" icon="el-icon-circle-plus" @click="dialogAddForm">添加</el-button>
+      <el-button type="primary" icon="el-icon-edit">设置轮播数</el-button>
     </el-row>
 
     <el-table
@@ -32,11 +31,11 @@
       highlight-current-row
       style="width: 100%; margin-top: 20px;"
       @sort-change="sortChange">
-      <el-table-column label="选择" type="selection" sortable="custom" align="center" width="100">
-        <!-- <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template> -->
-      </el-table-column>
+      <!-- <el-table-column label="选择" type="selection" sortable="custom" align="center" width="100"> -->
+      <!-- <template slot-scope="scope">
+      <span>{{ scope.row.id }}</span>
+      </template> -->
+      <!-- </el-table-column> -->
       <el-table-column label="编号" width="150px" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.id }}</span>
@@ -83,6 +82,12 @@
           <span>{{ scope.row.updateUserName }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="操作" class-name="status-col" width="300" align="center">
+        <template slot-scope="scope">
+          <el-button type="primary" icon="el-icon-edit" @click="updateBanner(scope.row.id)">修改</el-button>
+          <el-button type="danger" icon="el-icon-delete" @click="deleteBanner(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <!-- <pagination v-show="total>0" :total="total" :current-page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 20, 30]" @pagination="getList" /> -->
@@ -108,6 +113,7 @@
         </el-form-item>
         <el-form-item :label-width="formLabelWidth" label="banner位">
           <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
+            <el-option label="请选择位置" value="-1"/>
             <el-option
               v-for="item in bannerPositionArr"
               :key="item.id"
@@ -119,6 +125,7 @@
         </el-form-item>
         <el-form-item :label-width="formLabelWidth" label="投放社区">
           <el-select v-model="addForm.communityId" placeholder="请选择社区">
+            <el-option label="请选择社区" value="-1"/>
             <el-option
               v-for="item in communityArr"
               :key="item.id"
@@ -267,7 +274,7 @@ export default {
       calendarTypeOptions,
       addForm: {
         title: '',
-        sort: '',
+        sort: '1',
         bannerCover: '',
         bannerPosition: '',
         communityId: '',
@@ -295,12 +302,12 @@ export default {
       showContentVisible: false,
       showURLVisible: true,
       bannerPositionArr: [
-        {id: 1, value: '首页banner'},
-        {id: 2, value: '服务banner'}
+        { id: 1, value: '首页banner' },
+        { id: 2, value: '服务banner' }
       ],
       communityArr: [
-        {id: 3, value: '智慧社区'},
-        {id: 2, value: '测试社区'}
+        { id: 3, value: '智慧社区' },
+        { id: 2, value: '测试社区' }
       ]
     }
   },
@@ -308,6 +315,51 @@ export default {
     this.getList()
   },
   methods: {
+    deleteBanner(bannerId) {
+      this.$confirm('您确定删除此banner吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$store.dispatch('DeleteBanner', bannerId).then((res) => {
+            console.log('删除操作: ' + res.code)
+            if (res.code === '0') {
+              this.$notify({
+                title: '操作成功!',
+                message: res.message,
+                type: 'success'
+              })
+              this.getList()
+            } else {
+              this.$notify({
+                title: '操作失败',
+                message: res.message,
+                type: 'warning'
+              })
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+      
+    },
+    dialogAddForm() {
+      this.dialogFormVisible = true
+      this.addForm.title = ''
+      this.addForm.sort = '1',
+      this.addForm.bannerCover = ''
+      this.addForm.bannerPosition = '-1'
+      this.addForm.communityId = '-1'
+      this.addForm.effTime = ''
+      this.addForm.expTime = ''
+      this.addForm.bannerType = '1'
+      this.addForm.externalLink = ''
+      this.addForm.bannerTitle = ''
+      this.addForm.bannerContent = ''
+    },
     dialogForm(isVaule) {
       if (isVaule === '0') {
         this.dialogFormVisible = false
@@ -318,6 +370,15 @@ export default {
         console.log('添加banner的数据: ', this.addForm)
       }
     },
+    updateBanner(bannerId) {
+      this.getByBannerId(bannerId)
+      this.dialogPvVisible = true
+    },
+    getByBannerId(bannerId) {
+      this.$store.dispatch('GetByBannerId', bannerId).then(res => {
+        this.addForm = res
+      })
+    },
     showContent() {
       if (this.addForm.bannerType === '1') {
         this.showContentVisible = false
@@ -363,7 +424,11 @@ export default {
       })
     },
     handleFilter() {
-      this.listQuery.page = 1
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 5
+      this.listQuery.bannerTitle = undefined
+      this.listQuery.bannerPosition = undefined
+      this.listQuery.bannerDescription = undefined
       this.getList()
     },
     handleModifyStatus(row, status) {
@@ -379,14 +444,6 @@ export default {
         this.sortByID(order)
       }
     },
-    sortByID(order) {
-      if (order === 'ascending') {
-        this.listQuery.sort = '+id'
-      } else {
-        this.listQuery.sort = '-id'
-      }
-      this.handleFilter()
-    },
     resetTemp() {
       this.temp = {
         id: undefined,