ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/LnstBbhController.java

@@ -87,7 +87,7 @@ public class LnstBbhController extends BaseController
      */
     @RequiresPermissions("lnst:bbh:edit")
     @Log(title = "老年食堂app版本号信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody LnstBbh lnstBbh)
     {
         return toAjax(lnstBbhService.updateLnstBbh(lnstBbh));
@@ -98,9 +98,9 @@ public class LnstBbhController extends BaseController
      */
     @RequiresPermissions("lnst:bbh:remove")
     @Log(title = "老年食堂app版本号信息", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
+	@GetMapping("/remove")
+    public AjaxResult remove(LnstBbh lnstBbh)
     {
-        return toAjax(lnstBbhService.deleteLnstBbhByIds(ids));
+        return toAjax(lnstBbhService.deleteLnstBbhById(lnstBbh.getId()));
     }
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/ILnstBbhService.java

@@ -52,6 +52,6 @@ public interface ILnstBbhService
      * @param ids 需要删除的老年食堂app版本号信息主键集合
      * @return 结果
      */
-    public int deleteLnstBbhByIds(String[] ids);
+    public int deleteLnstBbhById(String ids);
 
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/LnstBbhServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -66,7 +65,13 @@ public class LnstBbhServiceImpl implements ILnstBbhService
         }
         LnstSbxx sbxx = lnstSbxxMapper.selectOne(new LambdaQueryWrapper<LnstSbxx>().eq(LnstSbxx::getSbid, lnstBbh.getSbid()));
         if (ObjectUtils.isEmpty(sbxx)) {
-            throw new ServiceException("您的设备还没有录入");
+            throw new ServiceException("您的设备未注册");
+        }
+        if (StringUtils.equals(sbxx.getSyzt(), "0")) {
+            throw new ServiceException("您的设备已注册但未启用");
+        }
+        if (StringUtils.equals(sbxx.getSyzt(), "2")) {
+            throw new ServiceException("您的设备已经被停用");
         }
         res.setSbxx(sbxx);
         return res;
@@ -99,13 +104,13 @@ public class LnstBbhServiceImpl implements ILnstBbhService
     /**
      * 批量删除老年食堂app版本号信息
      *
-     * @param ids 需要删除的老年食堂app版本号信息主键
+     * @param id 需要删除的老年食堂app版本号信息主键
      * @return 结果
      */
     @Override
-    public int deleteLnstBbhByIds(String[] ids)
+    public int deleteLnstBbhById(String id)
     {
-        return lnstBbhMapper.deleteBatchIds(Arrays.asList(ids));
+        return lnstBbhMapper.deleteById(id);
     }
 
 }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywJclrShxxServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.lnst.domain.InLnstShxx;
 import com.ruoyi.lnst.mapper.ZwywJclrShxxMapper;
 import com.ruoyi.lnst.service.IZwywJclrShxxService;
@@ -68,6 +69,8 @@ public class ZwywJclrShxxServiceImpl implements IZwywJclrShxxService
         }
         if (StringUtils.isNotEmpty(lrHjdz)) {
             zwywJclrShxx.setLrHjdz(null);
+        } else {
+            lrHjdz = SecurityUtils.getAreaCode();
         }
         LambdaQueryWrapper<InLnstShxx> lqw = new LambdaQueryWrapper<>(zwywJclrShxx);
         if (StringUtils.isNotEmpty(lrZjhm)) {

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/ZwywLrJbxxServiceImpl.java

@@ -818,7 +818,7 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         List<String> jmZjhm = Stream.of(zwywLrJbxx.getLrJmzjhm().split(",")).collect(Collectors.toList());
 
         for (String j: jmZjhm) {
-            InLnstLrxx lr = zwywLrJbxxMapper.selectOne(new LambdaQueryWrapper<InLnstLrxx>().eq(InLnstLrxx::getLrJmzjhm, j));
+            InLnstLrxx lr = zwywLrJbxxMapper.selectOne(new LambdaQueryWrapper<InLnstLrxx>().eq(InLnstLrxx::getLrJmzjhm, j).eq(InLnstLrxx::getState, "1"));
             if (ObjectUtils.isNotEmpty(lr)) {
                 EncryptionUtils.decryptForPlaintext(lr);
                 InLnstLrxx query = new InLnstLrxx();

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -42,13 +42,13 @@ public class YljgsqJcxx extends BaseEntity
     private String id;
 
     /** 机构组织代码 */
-    // @Excel(name = "机构组织代码")
+     @Excel(name = "机构组织代码")
     @ApiModelProperty(value = "机构组织代码", required = true)
     @Size(max = 10, message = "{机构组织代码}")
     private String zzjgdm;
 
     /** 统一社会信用代码 */
-     @Excel(name = "统一社会信用代码")
+    @Excel(name = "统一社会信用代码")
     @ApiModelProperty(value = "统一社会信用代码", required = true)
     @NotBlank(message = "{统一社会信用代码}",groups = AddZhGroup.class)
     @Size(max = 18, message = "{统一社会信用代码}")
@@ -72,7 +72,7 @@ public class YljgsqJcxx extends BaseEntity
     private String lng;
 
     /** 单位名称 */
-     @Excel(name = "单位名称")
+    @Excel(name = "单位名称")
     @ApiModelProperty(value = "单位名称", required = true)
 //    @NotBlank(message = "{单位名称}",groups = AddGroup.class)
     @NotBlank(message = "{单位名称}",groups = AddZhGroup.class)
@@ -80,26 +80,26 @@ public class YljgsqJcxx extends BaseEntity
     private String jgmc;
 
     /** 单位建立日期 */
-    // @Excel(name = "单位建立日期")
+     @Excel(name = "单位建立日期")
     @ApiModelProperty(value = "单位建立日期", required = true)
     @NotBlank(message = "{单位建立日期}",groups = AddGroup.class)
     @DateV(pattern = "yyyyMMdd", message = "{单位建立日期}")
     private String jlrq;
 
     /** 单位所属行政区划 */
-//     @Excel(name = "单位所属行政区划")
+    @Excel(name = "单位所属行政区划")
     @ApiModelProperty(value = "单位所属行政区划", required = true)
 //    @Size(min  = 1, max = 12, message = "{单位所属行政区划}")
     private String ssxzqh;
 
     /** 单位所在行政区划 */
-    // @Excel(name = "单位所在行政区划")
+    @Excel(name = "单位所在行政区划")
     @ApiModelProperty(value = "单位所在行政区划", required = true)
 //    @NotBlank(message = "{单位所在行政区划}",groups = AddGroup.class)
     private String szxzqh;
 
     /** 单位通信详细地址 */
-    // @Excel(name = "单位通信详细地址")
+     @Excel(name = "单位通信详细地址")
     @ApiModelProperty(value = "单位通信详细地址", required = true)
     @NotBlank(message = "{单位通信详细地址}",groups = AddGroup.class)
     @Size(min  = 1, max = 100, message = "{单位通信详细地址}")
@@ -107,7 +107,7 @@ public class YljgsqJcxx extends BaseEntity
     private String txdz;
 
     /** 法定代表人或负责人姓名 */
-     @Excel(name = "法定代表人或负责人姓名")
+    @Excel(name = "法定代表人或负责人姓名")
     @ApiModelProperty(value = "法定代表人或负责人姓名", required = true)
 //    @NotBlank(message = "{法定代表人或负责人姓名}",groups = AddGroup.class)
     @NotBlank(message = "{法定代表人或负责人姓名}",groups = AddZhGroup.class)
@@ -117,7 +117,7 @@ public class YljgsqJcxx extends BaseEntity
     private String frxm;
 
     /** 法定代表人或负责人联系电话 */
-     @Excel(name = "法定代表人或负责人联系电话")
+    @Excel(name = "法定代表人或负责人联系电话")
     @ApiModelProperty(value = "法定代表人或负责人联系电话", required = true)
 //    @NotBlank(message = "{法定代表人或负责人联系电话}",groups = AddGroup.class)
     @NotBlank(message = "{法定代表人或负责人联系电话}",groups = AddZhGroup.class)
@@ -125,77 +125,77 @@ public class YljgsqJcxx extends BaseEntity
     private String frlxfs;
 
     /** 法定代表人或负责人证件类型（C0015） */
-    // @Excel(name = "法定代表人或负责人证件类型", dictType = "C0015")
+    @Excel(name = "法定代表人或负责人证件类型", dictType = "C0015")
     @ApiModelProperty(value = "法定代表人或负责人证件类型（C0015）", required = true)
     @NotBlank(message = "{法定代表人或负责人证件类型}",groups = AddGroup.class)
     @DictV(type = "C0015",message = "{法定代表人或负责人证件类型}")
     private String frzjlx;
 
     /** 法定代表人或负责人证件号码 */
-    // @Excel(name = "法定代表人或负责人证件号码")
+    @Excel(name = "法定代表人或负责人证件号码")
     @ApiModelProperty(value = "法定代表人或负责人证件号码", required = true)
     @NotBlank(message = "{法定代表人或负责人证件号码}",groups = AddGroup.class)
     @EncryptionV
     private String frzjhm;
 
     /** 法人登记机关 */
-    // @Excel(name = "法人登记机关")
+    @Excel(name = "法人登记机关")
     @ApiModelProperty(value = "法人登记机关", required = true)
     @NotBlank(message = "{法人登记机关}",groups = AddGroup.class)
     @Size(min  = 1, max = 72, message = "{法人登记机关}")
     private String frdjjg;
 
     /** 法人类型（CH007） */
-    // @Excel(name = "法人类型", dictType = "CH007")
+    @Excel(name = "法人类型", dictType = "CH007")
     @ApiModelProperty(value = "法人类型（CH007）", required = true)
     @NotBlank(message = "{法人类型}",groups = AddGroup.class)
     @DictV(type = "CH007",message = "{法人类型}")
     private String frlx;
 
     /** 全托床位数量 */
-    // @Excel(name = "全托床位数量")
+     @Excel(name = "全托床位数量")
     @ApiModelProperty(value = "全托床位数量", required = true)
     @NotBlank(message = "{全托床位数量}",groups = AddGroup.class)
     @NumberV(message = "{全托床位数量}")
     private String qtcws;
 
     /** 日托床位数量 */
-    // @Excel(name = "日托床位数量")
+     @Excel(name = "日托床位数量")
     @ApiModelProperty(value = "日托床位数量", required = true)
     @NotBlank(message = "{日托床位数量}",groups = AddGroup.class)
     @NumberV(message = "{日托床位数量}")
     private String rtcws;
 
     /** 床位总数量 */
-    // @Excel(name = "床位总数量")
+     @Excel(name = "床位总数量")
     @ApiModelProperty(value = "床位总数量", required = true)
     @NotBlank(message = "{床位总数量}",groups = AddGroup.class)
     @NumberV(message = "{床位总数量}")
     private String cwzs;
 
     /** 护理型床位数量 */
-    // @Excel(name = "护理型床位数量")
+     @Excel(name = "护理型床位数量")
     @ApiModelProperty(value = "护理型床位数量", required = true)
     @NotBlank(message = "{护理型床位数量}",groups = AddGroup.class)
     @NumberV(message = "{护理型床位数量}")
     private String hlxcws;
 
     /** 建筑面积 */
-    // @Excel(name = "建筑面积")
+     @Excel(name = "建筑面积")
     @ApiModelProperty(value = "建筑面积", required = true)
     @NotBlank(message = "{建筑面积}",groups = AddGroup.class)
     @Digits(integer = 10,fraction = 2,message = "{建筑面积}")
     private String jzmj;
 
     /** 占地面积 */
-    // @Excel(name = "占地面积")
+     @Excel(name = "占地面积")
     @ApiModelProperty(value = "占地面积", required = true)
     @NotBlank(message = "{占地面积}",groups = AddGroup.class)
     @Digits(integer = 10,fraction = 2,message = "{占地面积}")
     private String zdmj;
 
     /** 场所性质（CH032） */
-    // @Excel(name = "场所性质", dictType = "CH032")
+     @Excel(name = "场所性质", dictType = "CH032")
     @ApiModelProperty(value = "场所性质（CH032）", required = true)
     @NotBlank(message = "{场所性质}",groups = AddGroup.class)
     @DictV(type = "CH032",message = "{场所性质}")
@@ -209,21 +209,21 @@ public class YljgsqJcxx extends BaseEntity
     private String isJm;
 
     /** 单位性质（C0038） */
-    // @Excel(name = "单位性质", dictType = "C0038")
+     @Excel(name = "单位性质", dictType = "C0038")
     @ApiModelProperty(value = "单位性质（C0038）", required = true)
     @NotBlank(message = "{单位性质}",groups = AddGroup.class)
     @DictV(type = "C0038",message = "{单位性质}")
     private String dwxz;
 
     /** 兴办主体（CH010） */
-    // @Excel(name = "兴办主体", dictType = "CH010")
+     @Excel(name = "兴办主体", dictType = "CH010")
     @ApiModelProperty(value = "兴办主体（CH010）", required = true)
     @NotBlank(message = "{兴办主体}",groups = AddGroup.class)
     @DictV(type = "CH010",message = "{兴办主体}")
     private String xbzt;
 
     /** 所处位置（CH012） */
-    // @Excel(name = "所处位置", dictType = "CH012")
+     @Excel(name = "所处位置", dictType = "CH012")
     @ApiModelProperty(value = "所处位置（CH012）", required = true)
     @NotBlank(message = "{所处位置}",groups = AddGroup.class)
     @DictV(type = "CH012",message = "{所处位置}")

ruoyi-ui/.env.development

@@ -2,6 +2,8 @@
 VUE_APP_TITLE = 食堂测试系统test
 VUE_APP_TITLE1 = 食堂测试系统
 VUE_APP_LOGO = '@/assets/images/shijihome/img_14.png'
+VUE_APP_LOGIN_LOGO = '@/assets/images/shijihome/img_14.png'
+
 
 
 # 开发环境配置

ruoyi-ui/.env.production

@@ -2,6 +2,7 @@
 VUE_APP_TITLE = 吉林养老服务信息系统
 VUE_APP_TITLE1 = 养老服务信息系统
 VUE_APP_LOGO = '@/assets/logo/logo.png'
+VUE_APP_LOGIN_LOGO = '@/assets/images/login-logo1.png'
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/src/api/lnst/bbh.js

@@ -29,8 +29,8 @@ export function addBbh(data) {
 // 修改老年食堂app版本号信息
 export function updateBbh(data) {
   return request({
-    url: '/lnst/bbh',
-    method: 'put',
+    url: '/lnst/bbh/edit',
+    method: 'post',
     data: data
   })
 }
@@ -38,7 +38,8 @@ export function updateBbh(data) {
 // 删除老年食堂app版本号信息
 export function delBbh(id) {
   return request({
-    url: '/lnst/bbh/' + id,
-    method: 'delete'
+    url: '/lnst/bbh/remove',
+    method: 'get',
+    params: { id: id }
   })
 }

ruoyi-ui/src/views/lnst/sbxx/index.vue

@@ -54,16 +54,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['lnst:sbxx:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['lnst:sbxx:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -373,7 +373,19 @@
       }).catch(() => {});
     },
     handleStatus(row) {
-      const param = { id: row.id, syzt: row.syzt === '1' ? '2' : '1' }
+      let zt;
+      if (row.syzt === '1') {
+        zt = '2';
+      } else {
+        zt = '1';
+      }
+      if (zt === '1') {
+        if (!row.yqbm || !row.yqmc || !row.stbm || !row.stmc) {
+          this.$modal.msgWarning("信息不全不能启用！");
+          return;
+        }
+      }
+      const param = { id: row.id, syzt: zt }
       this.submitFormLoading = true;
       updateSbxx(param).then(response => {
         this.$modal.msgSuccess("修改成功");

ruoyi-ui/src/views/login.vue

@@ -69,7 +69,7 @@ export default {
   data() {
     return {
       title: process.env.VUE_APP_TITLE,
-      logo: require(process.env.VUE_APP_LOGO),
+      logo: require(process.env.VUE_APP_LOGIN_LOGO),
       codeUrl: "",
       loginForm: {
         username: "",