Merge remote-tracking branch 'origin/master'

danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTNfcSettingList" parameterType="TNfcSetting" resultMap="TNfcSettingResult">
         <include refid="selectTNfcSettingVo"/>
         <where>
+            is_del='0'
+            and
             region = #{region}
             <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address = #{patrolAddress}</if>
             <if test="nfcNum != null  and nfcNum != ''"> and nfc_num = #{nfcNum}</if>
@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nfcNum != null">nfc_num,</if>
             <if test="createTime != null">create_time,</if>
             <if test="isDel != null">is_del,</if>
+            <if test="region != null">region,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="patrolSort != null">#{patrolSort},</if>
@@ -57,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nfcNum != null">#{nfcNum},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="isDel != null">#{isDel},</if>
+            <if test="region != null">#{region},</if>
          </trim>
     </insert>
 
@@ -78,10 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from t_nfc_setting where nfc_id = #{nfcId}
     </delete>
 
-    <delete id="deleteTNfcSettingByIds" parameterType="String">
-        delete from t_nfc_setting where nfc_id in
+    <update id="deleteTNfcSettingByIds" parameterType="String">
+        update  t_nfc_setting set is_del='1' where nfc_id in
         <foreach item="nfcId" collection="array" open="(" separator="," close=")">
             #{nfcId}
         </foreach>
-    </delete>
+    </update>
 </mapper>

danger-manage-web/src/api/system/setting.js

 import request from '@/utils/request'
 
-// 查询系统参数配置列表
+// 查询setting列表
 export function listSetting(query) {
   return request({
-    url: '/system/setting/list',
+    url: '/system/inspection/list',
     method: 'get',
     params: query
   })
 }
 
-// 查询系统参数配置详细
-export function getSetting(systemId) {
+// 查询setting详细
+export function getSetting(nfcId) {
   return request({
-    url: '/system/setting/' + systemId,
+    url: '/system/inspection/' + nfcId,
     method: 'get'
   })
 }
 
-// 新增系统参数配置
+// 新增setting
 export function addSetting(data) {
   return request({
-    url: '/system/setting',
+    url: '/system/inspection',
     method: 'post',
     data: data
   })
 }
 
-// 修改系统参数配置
+// 修改setting
 export function updateSetting(data) {
   return request({
-    url: '/system/setting',
+    url: '/system/inspection',
     method: 'put',
     data: data
   })
 }
 
-// 删除系统参数配置
-export function delSetting(systemId) {
+// 删除setting
+export function delSetting(nfcId) {
   return request({
-    url: '/system/setting/' + systemId,
+    url: '/system/inspection/' + nfcId,
     method: 'delete'
   })
 }
 
-// 导出系统参数配置
+// 导出setting
 export function exportSetting(query) {
   return request({
-    url: '/system/setting/export',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出系统参数配置
-export function refreshSystemSetting(query) {
-  return request({
-    url: '/system/setting/refreshSystemSetting',
+    url: '/system/inspection/export',
     method: 'get',
     params: query
   })