appnfc

project_data/sql/0.0.2/soc/soc.sql

@@ -989,6 +989,11 @@ IF
 
 	END IF;
 	IF
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'sys_nfc_bind' AND COLUMN_NAME = 'source' ) THEN
+ALTER TABLE sys_nfc_bind ADD COLUMN source VARCHAR ( 2 ) COMMENT '来源1web端2app';
+
+END IF;
+	IF
 		EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'sys_area_check' AND COLUMN_NAME = 'area_id' ) THEN
 			ALTER TABLE sys_area_check DROP COLUMN area_id;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -387,7 +387,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             sysOrg.setPath(nowUserOrg.getPath());
             sysOrg.setType(Integer.valueOf(tMonitoringRetrievalPlan.getOrgType()));
             List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);
-            // List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
             for (SysOrg s : sysOrgs) {
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
                 BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -510,11 +510,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             dateRange = DateUtils.getStartAndEnd(dateTime, EduTrainingPlanCycleEnum.toCommmonEnum(Integer.parseInt(plan.getPlanCycle())));
         }
         Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
-        for (int i = 1; i <= plan.getPlanFrequency(); i++) {
-            DateRange dateRange1 = dateRanges.get(i);
-            CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, i, plan, sysOrg, dateRange1, ymd);
-            taskList.add(task);
-        }
         //判断作息（无周期排开）
         if(!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode().toString())){
             boolean flag = checkWorkTime(dateRange.getStartTime(), dateRange.getEndTime(), sysOrg.getId());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysNfcBindController.java

@@ -1,6 +1,7 @@
 package com.xunmei.system.controller;
 
 import java.util.List;
+
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysAreaCheck;
 import com.xunmei.system.service.ISysAreaCheckService;
@@ -52,6 +53,15 @@ public class SysNfcBindController extends BaseController {
         return sysNfcBindService.selectPage(sysNfcBind);
     }
 
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation(value = "获取SysNfcBind详细信息")
+    @RequiresPermissions("system:bind:query")
+    @GetMapping(value = {"/appGetInfo", "/{code}"})
+    public AjaxResult appGetInfo(@PathVariable(value = "code", required = false) String code) {
+        return success(sysNfcBindService.selectSysNfcBindByCode(code));
+    }
 
     /**
      * 获取【请填写功能名称】详细信息
@@ -106,4 +116,15 @@ public class SysNfcBindController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(sysNfcBindService.deleteSysNfcBindByIds(ids));
     }
+
+    /**
+     * 解绑【请填写功能名称】
+     */
+    @ApiOperation(value = "解绑")
+    @RequiresPermissions("system:bind:remove")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @DeleteMapping("/unbinding/{code}")
+    public AjaxResult unbinding(@PathVariable String code) {
+        return toAjax(sysNfcBindService.deleteSysNfcBindByCode(code));
+    }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysNfcBind.java

@@ -57,7 +57,7 @@ public class SysNfcBind extends BaseEntity {
      */
     @ApiModelProperty(value = "标签编号")
     private String code;
-    @ApiModelProperty(value = "标签名称")
+    @ApiModelProperty(value = "标签名称,app没有不传")
     private String labelName;
 
     /**
@@ -65,7 +65,8 @@ public class SysNfcBind extends BaseEntity {
      */
     @ApiModelProperty(value = "最后修改人id")
     private Long updateId;
-
+    @ApiModelProperty(value = "来源1web端2app")
+private String source;
     /**
      * 机构
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysNfcBindMapper.java

@@ -40,7 +40,7 @@ public interface SysNfcBindMapper extends BaseMapper<SysNfcBind> {
      * @return
      */
     Page<SysNfcBind> selectNFCPage(Page<SysNfcBind> page, @Param("info") SysNfcBind info);
-
+    SysNfcBind selectSysNfcBindByCode(String code);
     /**
      * 修改区域名称
      * @param sysNfcBind
@@ -69,7 +69,7 @@ public interface SysNfcBindMapper extends BaseMapper<SysNfcBind> {
      * @return 结果
      */
      int updateSysNfcBind(SysNfcBind sysNfcBind);
-
+    int deleteSysNfcBindByCode(String code);
     /**
      * 删除【请填写功能名称】
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysNfcBindService.java

@@ -22,6 +22,7 @@ public interface ISysNfcBindService extends IService<SysNfcBind> {
      */
     SysNfcBind selectSysNfcBindById(Long id);
 
+    SysNfcBind selectSysNfcBindByCode(String code);
     /**
      * 查询【NFC管理】列表
      *
@@ -53,7 +54,7 @@ public interface ISysNfcBindService extends IService<SysNfcBind> {
      * @return 结果
      */
     int deleteSysNfcBindByIds(Long[] ids);
-
+int deleteSysNfcBindByCode(String code);
     /**
      * 删除【NFC管理】信息
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -91,6 +91,11 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         return sysNfcBindMapper.selectById(id);
     }
 
+    @Override
+    public SysNfcBind selectSysNfcBindByCode(String code) {
+        return sysNfcBindMapper.selectSysNfcBindByCode(code);
+    }
+
     /**
      * 查询【请填写功能名称】列表
      *
@@ -123,6 +128,10 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());
         sysNfcBind.setCreateTime(DateUtils.getNowDate());
         sysNfcBind.setDelFlag("0");
+        sysNfcBind.setSource("1");
+        if(null==sysNfcBind.getCode()){
+            sysNfcBind.setSource("2");
+        }
         SysOrg sysOrg = sysOrgService.selectSysOrgById(sysNfcBind.getOrgId());
         if (null != sysOrg) {
             sysNfcBind.setOrgName(sysOrg.getShortName());
@@ -194,6 +203,11 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
 
     }
 
+    @Override
+    public int deleteSysNfcBindByCode(String code) {
+        return sysNfcBindMapper.deleteSysNfcBindByCode(code);
+    }
+
     /**
      * 删除【请填写功能名称】信息
      *

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysNfcBindMapper.xml

@@ -122,6 +122,9 @@
         </if>
         order by a.org_id,a.area_id,code
     </select>
+    <select id="selectSysNfcBindByCode" resultType="com.xunmei.system.domain.SysNfcBind">
+        SELECT * FROM sys_nfc_bind WHERE source=2 AND code=#{code}
+    </select>
 
     <insert id="insertSysNfcBind" parameterType="com.xunmei.system.domain.SysNfcBind">
         insert into sys_nfc_bind
@@ -252,4 +255,10 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteSysNfcBindByCode">
+        delete
+        from sys_nfc_bind
+        where source = '2'
+          and code = #{code}
+    </delete>
 </mapper>