巡检管理-检查条目相关接口已完成

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolCheckEntryController.java

@@ -0,0 +1,100 @@
+package com.bizmatics.controller.web;
+
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.PatrolCheckEntry;
+import com.bizmatics.service.PatrolCheckEntryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("/patrolCheckEntry")
+public class PatrolCheckEntryController {
+
+    @Autowired
+    private PatrolCheckEntryService patrolCheckEntryService;
+
+    /**
+     * 巡检管理-检查条目-检查项-新增
+     *
+     * @param patrolCheckEntry
+     * @return
+     */
+    @GetMapping("patrolCheckEntryAdd")
+    public ApiResult<Void> patrolCheckEntryAdd(@RequestBody PatrolCheckEntry patrolCheckEntry
+    ) {
+        patrolCheckEntryService.patrolCheckEntryAdd(patrolCheckEntry);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 巡检管理-检查条目-检查项-修改
+     *
+     * @param patrolCheckEntry
+     * @return
+     */
+    @GetMapping("patrolCheckEntryUpdate")
+    public ApiResult<Void> patrolCheckEntryUpdate(@RequestBody PatrolCheckEntry patrolCheckEntry
+    ) {
+        patrolCheckEntryService.patrolCheckEntryUpdate(patrolCheckEntry);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 巡检管理-检查条目-检查项-注销
+     *
+     * @param id 检查条目检查项id
+     * @return
+     */
+    @GetMapping("patrolCheckEntryDel")
+    public ApiResult<Void> patrolCheckEntryDel(@RequestParam Integer id
+    ) {
+        patrolCheckEntryService.patrolCheckEntryDel(id);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 巡检管理-检查条目-检查项-检查项列表查询
+     *
+     * @param checkEntryName 检查项名称
+     * @param deviceTypeId   设备类型id
+     * @param size           页数
+     * @param current        条数
+     * @return
+     */
+    @GetMapping("patrolCheckEntryList")
+    public ApiResult<CommonPage<PatrolCheckEntry>> patrolCheckEntryList(@RequestParam(required = false) String checkEntryName,
+                                                                        @RequestParam Integer deviceTypeId,
+                                                                        @RequestParam(value = "size", required = false, defaultValue = "1") Integer size,
+                                                                        @RequestParam(value = "current", required = false, defaultValue = "10") Integer current,
+                                                                        @RequestParam(value = "id", required = false, defaultValue = "0") Integer id
+    ) {
+        return ApiResult.success(patrolCheckEntryService.patrolCheckEntryList(checkEntryName, deviceTypeId, size, current, id));
+    }
+
+    /**
+     * 巡检管理-检查条目-检查项-下拉框
+     * @param deviceTypeId
+     * @return
+     */
+    @GetMapping("patrolCheckEntrydDroplist")
+    public ApiResult<List<PatrolCheckEntry>> patrolCheckEntrydDroplist(@RequestParam Integer deviceTypeId
+    ) {
+        return ApiResult.success(patrolCheckEntryService.patrolCheckEntrydDroplist(deviceTypeId));
+    }
+}
+

fiveep-controller/src/main/java/com/bizmatics/controller/web/PatrolDeviceTypeController.java

@@ -0,0 +1,81 @@
+package com.bizmatics.controller.web;
+
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.vo.PatrolDeviceListVO;
+import com.bizmatics.service.PatrolDeviceTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+@RestController
+@RequestMapping("/patrolDeviceType")
+public class PatrolDeviceTypeController {
+
+    @Autowired
+    private PatrolDeviceTypeService patrolDeviceTypeService;
+
+    /**
+     *巡检管理-检查条目-检查条目设备类型-新增
+     * @param deviceTypeName 设备类型名称
+     * @return
+     */
+    @GetMapping("patrolDeviceTypeAdd")
+    public ApiResult<Void> patrolDeviceTypeAdd(@RequestParam(required = false) String deviceTypeName
+    ) {
+        patrolDeviceTypeService.patrolDeviceTypeAdd(deviceTypeName);
+        return ApiResult.success();
+    }
+
+    /**
+     *巡检管理-检查条目-检查条目设备类型-修改
+     * @param id 检查条目设备类型id
+     * @param deviceTypeName 设备类型名称
+     * @return
+     */
+    @GetMapping("patrolDeviceTypeUpdate")
+    public ApiResult<Void> patrolDeviceTypeUpdate(@RequestParam Integer id,
+                                                  @RequestParam(required = false) String deviceTypeName
+    ) {
+        patrolDeviceTypeService.patrolDeviceTypeUpdate(id, deviceTypeName);
+        return ApiResult.success();
+    }
+
+    /**
+     *巡检管理-检查条目-检查条目设备类型-注销
+     * @param id 检查条目设备类型id
+     * @return
+     */
+    @GetMapping("patrolDeviceTypeDel")
+    public ApiResult<Void> patrolDeviceTypeDel(@RequestParam Integer id
+    ) {
+        patrolDeviceTypeService.patrolDeviceTypeDel(id);
+        return ApiResult.success();
+    }
+
+    /**
+     *巡检管理-检查条目-检查条目设备类型-检查条目设备类型查询
+     * @param deviceTypeName 设备类型名称
+     * @param id  检查条目设备类型ID
+     * @return
+     */
+    @GetMapping("patrolDeviceTypeList")
+    public ApiResult<List<PatrolDeviceListVO>> patrolDeviceTypeList(@RequestParam(required = false) String deviceTypeName,
+                                                                    @RequestParam(value = "id", required = false, defaultValue = "0") Integer id
+    ) {
+        return ApiResult.success(patrolDeviceTypeService.patrolDeviceTypeList(deviceTypeName,id));
+    }
+}
+

fiveep-model/src/main/java/com/bizmatics/model/PatrolCheckEntry.java

@@ -0,0 +1,80 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PatrolCheckEntry implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 检查条目检查项id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备类型id
+     */
+    private Integer deviceTypeId;
+
+    /**
+     * 检查项名称
+     */
+    private String checkEntryName;
+
+    /**
+     * 参考关系
+     */
+    private String referringToRelation;
+
+    /**
+     * 参考值
+     */
+    private String referenceValue;
+
+    /**
+     * 步骤描述
+     */
+    private String stepsDescribe;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 启用状态（0 未启用，1 启用）
+     */
+    private Integer status;
+
+
+}

fiveep-model/src/main/java/com/bizmatics/model/PatrolDeviceType.java

@@ -0,0 +1,55 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PatrolDeviceType implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 检查条目设备类型id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备类型名称
+     */
+    private String deviceTypeName;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 启用状态（0 未启用，1 启用）
+     */
+    private Integer status;
+
+
+}

fiveep-model/src/main/java/com/bizmatics/model/vo/PatrolDeviceListVO.java

@@ -0,0 +1,31 @@
+package com.bizmatics.model.vo;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author yq
+ * @date 2021/7/8 14:30
+ * 公用的图标VO
+ */
+@Builder
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PatrolDeviceListVO {
+
+    /**
+     * 检查条目设备类型id
+     */
+    private Integer id;
+    /**
+     * 类型名称
+     */
+    private String deviceTypeName;
+    /**
+     * 检查项数量
+     */
+    private Integer checkEntryCount;
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/PatrolCheckEntryMapper.java

@@ -0,0 +1,16 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.PatrolCheckEntry;
+import com.bizmatics.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+public interface PatrolCheckEntryMapper extends CrudMapper<PatrolCheckEntry> {
+
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/PatrolDeviceTypeMapper.java

@@ -0,0 +1,22 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.PatrolDeviceType;
+import com.bizmatics.model.vo.PatrolDeviceListVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+public interface PatrolDeviceTypeMapper extends CrudMapper<PatrolDeviceType> {
+    List<PatrolDeviceListVO> patrolDeviceList(@Param("deviceTypeName") String deviceTypeName,
+                                              @Param("id") Integer id);
+
+}

fiveep-persistence/src/main/resources/mapper/mysql/PatrolCheckEntryMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.persistence.mapper.PatrolCheckEntryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.PatrolCheckEntry">
+        <id column="id" property="id" />
+        <result column="device_type_id" property="deviceTypeId" />
+        <result column="check_entry_name" property="checkEntryName" />
+        <result column="referring_to_relation" property="referringToRelation" />
+        <result column="reference_value" property="referenceValue" />
+        <result column="steps_describe" property="stepsDescribe" />
+        <result column="remark" property="remark" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="status" property="status" />
+    </resultMap>
+
+</mapper>

fiveep-persistence/src/main/resources/mapper/mysql/PatrolDeviceTypeMapper.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.persistence.mapper.PatrolDeviceTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.PatrolDeviceType">
+        <id column="id" property="id" />
+        <result column="device_type_name" property="deviceTypeName" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <select id="patrolDeviceList" resultType="com.bizmatics.model.vo.PatrolDeviceListVO">
+        SELECT
+        a.id,
+        a.device_type_name,
+        IF (
+        b.check_entry_count &lt;&gt; '',
+        b.check_entry_count,
+        0
+        ) AS check_entry_count
+        FROM
+        patrol_device_type AS a
+        LEFT JOIN (
+        SELECT
+        device_type_id,
+        COUNT(*) AS check_entry_count
+        FROM
+        patrol_check_entry
+        <where>
+            status=1
+        </where>
+        GROUP BY
+        device_type_id
+        ) AS b ON a.id = b.device_type_id
+        <where>
+            a.status =1
+            <if test="deviceTypeName != null and deviceTypeName !=''">
+                and a.device_type_name LIKE CONCAT(CONCAT('%', #{deviceTypeName}), '%')
+            </if>
+            <if test="id != null and id !=0">
+                and a.id = #{id}
+            </if>
+        </where>
+        order by a.id desc
+    </select>
+
+</mapper>

fiveep-service/src/main/java/com/bizmatics/service/PatrolCheckEntryService.java

@@ -0,0 +1,28 @@
+package com.bizmatics.service;
+
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.Device;
+import com.bizmatics.model.PatrolCheckEntry;
+import com.bizmatics.common.mvc.base.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+public interface PatrolCheckEntryService extends CrudService<PatrolCheckEntry> {
+    void patrolCheckEntryAdd(PatrolCheckEntry patrolCheckEntry);
+
+    void patrolCheckEntryUpdate(PatrolCheckEntry patrolCheckEntry);
+
+    void patrolCheckEntryDel(Integer id);
+
+    CommonPage<PatrolCheckEntry> patrolCheckEntryList(String checkEntryName, Integer deviceTypeId, Integer size, Integer current,Integer id);
+
+    List<PatrolCheckEntry> patrolCheckEntrydDroplist(Integer deviceTypeId);
+}

fiveep-service/src/main/java/com/bizmatics/service/PatrolDeviceTypeService.java

@@ -0,0 +1,25 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.PatrolDeviceType;
+import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.vo.PatrolDeviceListVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+public interface PatrolDeviceTypeService extends CrudService<PatrolDeviceType> {
+    void patrolDeviceTypeAdd(String deviceTypeName);
+
+    void patrolDeviceTypeUpdate(Integer id, String deviceTypeName);
+
+    void patrolDeviceTypeDel(Integer id);
+
+    List<PatrolDeviceListVO> patrolDeviceTypeList(String deviceTypeName,Integer id);
+}

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java

@@ -64,7 +64,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
         IPage<DeviceAnalogVariableList> page = new Page<DeviceAnalogVariableList>(size, current);
         LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DeviceAnalogVariableList::getDeviceCode, deviceCode).eq(DeviceAnalogVariableList::getStatus, 1);
-        if (screen != null && screen.equals("")) {
+        if (screen != null && !screen.equals("")) {
             queryWrapper.and(wq -> wq
                     .like(DeviceAnalogVariableList::getVariableName, screen)
                     .or()

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -191,7 +191,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         if (deviceType != null && deviceType!=0) {
             queryWrapper.eq(Device::getDeviceType, deviceType);
         }
-        if (deviceName!=null && deviceName.equals("") && deviceName.equals(null)){
+        if (deviceName!=null && !deviceName.equals("") && !deviceName.equals(null)){
             queryWrapper.like(Device::getDeviceName, deviceName);
         }
 

fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolCheckEntryServiceImpl.java

@@ -0,0 +1,75 @@
+package com.bizmatics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.Device;
+import com.bizmatics.model.PatrolCheckEntry;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.persistence.mapper.PatrolCheckEntryMapper;
+import com.bizmatics.service.PatrolCheckEntryService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+@Service
+public class PatrolCheckEntryServiceImpl extends AbstractCrudService<PatrolCheckEntryMapper, PatrolCheckEntry> implements PatrolCheckEntryService {
+
+    @Override
+    public void patrolCheckEntryAdd(PatrolCheckEntry patrolCheckEntry){
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        patrolCheckEntry.setCreator(user.getUserName());
+        patrolCheckEntry.setCreateTime(new Date());
+        patrolCheckEntry.setStatus(1);
+        this.save(patrolCheckEntry);
+    }
+
+    @Override
+    public void patrolCheckEntryUpdate(PatrolCheckEntry patrolCheckEntry){
+        this.updateById(patrolCheckEntry);
+    }
+
+    @Override
+    public void patrolCheckEntryDel(Integer id){
+        PatrolCheckEntry patrolCheckEntry = new PatrolCheckEntry();
+        patrolCheckEntry.setId(id);
+        patrolCheckEntry.setStatus(0);
+        this.updateById(patrolCheckEntry);
+    }
+
+    @Override
+    public  CommonPage<PatrolCheckEntry> patrolCheckEntryList(String checkEntryName,Integer deviceTypeId,Integer size,Integer current,Integer id){
+        IPage<PatrolCheckEntry> page = new Page<PatrolCheckEntry>(size, current);
+        LambdaQueryWrapper<PatrolCheckEntry> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolCheckEntry::getStatus, 1).eq(PatrolCheckEntry::getDeviceTypeId, deviceTypeId);
+        if (checkEntryName!=null&&!checkEntryName.equals("")&&!checkEntryName.equals(null)){
+            queryWrapper.like(PatrolCheckEntry::getCheckEntryName, checkEntryName);
+        }
+        if (id!=null&&id!=0){
+            queryWrapper.eq(PatrolCheckEntry::getId,id);
+        }
+        page = this.page(page, queryWrapper);
+        this.ToCommonPage(page);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
+    }
+
+    @Override
+    public List<PatrolCheckEntry> patrolCheckEntrydDroplist(Integer deviceTypeId){
+        LambdaQueryWrapper<PatrolCheckEntry> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolCheckEntry::getStatus, 1).in(PatrolCheckEntry::getDeviceTypeId, deviceTypeId);
+        return this.list(queryWrapper);
+    }
+}

fiveep-service/src/main/java/com/bizmatics/service/impl/PatrolDeviceTypeServiceImpl.java

@@ -0,0 +1,62 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.PatrolDeviceType;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.PatrolDeviceListVO;
+import com.bizmatics.persistence.mapper.PatrolDeviceTypeMapper;
+import com.bizmatics.service.PatrolDeviceTypeService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-15
+ */
+@Service
+public class PatrolDeviceTypeServiceImpl extends AbstractCrudService<PatrolDeviceTypeMapper, PatrolDeviceType> implements PatrolDeviceTypeService {
+    @Override
+    public void patrolDeviceTypeAdd(String deviceTypeName){
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        PatrolDeviceType patrolDeviceType = new  PatrolDeviceType();
+        patrolDeviceType.setDeviceTypeName(deviceTypeName);
+        patrolDeviceType.setCreator(user.getUserName());
+        patrolDeviceType.setCreateTime(new Date());
+        patrolDeviceType.setStatus(1);
+        this.save(patrolDeviceType);
+    }
+
+    @Override
+    public void patrolDeviceTypeUpdate(Integer id,String deviceTypeName){
+        PatrolDeviceType patrolDeviceType = new  PatrolDeviceType();
+        patrolDeviceType.setId(id);
+        patrolDeviceType.setDeviceTypeName(deviceTypeName);
+        this.updateById(patrolDeviceType);
+    }
+
+    @Override
+    public void patrolDeviceTypeDel(Integer id){
+        PatrolDeviceType patrolDeviceType = new  PatrolDeviceType();
+        patrolDeviceType.setId(id);
+        patrolDeviceType.setStatus(0);
+        this.updateById(patrolDeviceType);
+    }
+
+
+
+    @Override
+    public List<PatrolDeviceListVO> patrolDeviceTypeList(String deviceTypeName,Integer id){
+        List<PatrolDeviceListVO> patrolDeviceTypeList = baseMapper.patrolDeviceList(deviceTypeName,id);
+        return patrolDeviceTypeList;
+    }
+
+
+
+}