exit SmileOrganization,SmileSchool

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

@@ -4,13 +4,11 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
 import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
+import com.liquidnet.service.smile.entity.SmileOrganization;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -38,4 +36,22 @@ public class SmileOrganizationController {
         return AjaxResult.success(organizationList);
     }
 
+    @PostMapping("/create")
+    @ApiOperation("新增组织")
+    @ResponseBody
+    public AjaxResult create(@RequestBody SmileOrganization smileOrganization){
+        return AjaxResult.success(imsOrganizationService.create(smileOrganization));
+    }
+
+    @PostMapping("/updateOrg")
+    @ApiOperation("修改组织")
+    @ResponseBody
+    public AjaxResult updateOrg(@RequestBody SmileOrganization smileOrganization){
+        if (imsOrganizationService.update(smileOrganization)){
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error();
+        }
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileSchoolController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
+import com.liquidnet.service.smile.entity.SmileSchool;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,4 +26,39 @@ public class SmileSchoolController {
 
     @Autowired
     ISmileSchoolService iSmileSchoolService;
+
+
+    @GetMapping("/schoolList")
+    @ApiOperation("获取学校列表")
+    @ResponseBody
+    public AjaxResult schoolList() {
+        List<SmileSchool> smileSchools = iSmileSchoolService.schoolList();
+        return AjaxResult.success(smileSchools);
+    }
+
+    @GetMapping("/getSchoolById")
+    @ApiOperation("根据id获取学校")
+    @ResponseBody
+    public AjaxResult getSchoolById(@RequestParam(name = "id", required = true)Long id){
+        return AjaxResult.success(iSmileSchoolService.getSchoolById(id));
+    }
+
+    @PostMapping("create")
+    @ApiOperation("新建学校")
+    @ResponseBody
+    public AjaxResult create(@RequestBody SmileSchool smileSchool){
+        return AjaxResult.success(iSmileSchoolService.create(smileSchool));
+    }
+
+    @PostMapping("updateById")
+    @ApiOperation("新建学校")
+    @ResponseBody
+    public AjaxResult updateById(@RequestBody SmileSchool smileSchool){
+        if (iSmileSchoolService.updateById(smileSchool)){
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error();
+
+        }
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -4,6 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
 import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
 import com.liquidnet.service.smile.entity.SmileUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -58,8 +59,8 @@ public class SmileUserController extends BaseController {
     @ResponseBody
     public AjaxResult getUserListByOrgId(@RequestParam(name = "orgId",required = true)Long orgId,@RequestParam(name = "agentId",required =true)Long agentId){
         logger.info("orgId:{},agentId:{}",orgId,agentId);
-        List<SmileUserVo> smileUserVos = iSmileUserService.getUserListByOrgId(orgId,agentId);
-        return AjaxResult.success(smileUserVos);
+        List<SmileUserVoOrg> userListByOrgId = iSmileUserService.getUserListByOrgId(orgId, agentId);
+        return AjaxResult.success(userListByOrgId);
     }
 
     @GetMapping("/getUserByPhone")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileOrganizationService.java

@@ -18,4 +18,8 @@ import java.util.List;
 public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
     List<SmileOrganizationVo> organizationList();
+
+    Integer create(SmileOrganization smileOrganization);
+
+    Boolean update(SmileOrganization smileOrganization);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileSchoolService.java

@@ -4,6 +4,8 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,4 +16,9 @@ import com.liquidnet.service.smile.entity.SmileSchool;
  */
 public interface ISmileSchoolService extends IService<SmileSchool> {
 
+    List<SmileSchool> schoolList();
+
+    SmileSchool getSchoolById(Long id);
+
+    Integer create(SmileSchool smileSchool);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -50,7 +50,17 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public Integer create(SmileOrganization smileOrganization) {
+        log.info("smileOrganization:{}",smileOrganization);
+        return smileOrganizationMapper.insert(smileOrganization);
+    }
 
+    @Override
+    public Boolean update(SmileOrganization smileOrganization) {
+        smileOrganizationMapper.updateById(smileOrganization);
+        return true;
+    }
 
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileSchoolServiceImpl.java

@@ -6,8 +6,11 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务实现类
@@ -20,4 +23,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSchool> implements ISmileSchoolService {
 
+    @Autowired
+    SmileSchoolMapper smileSchoolMapper;
+
+    @Override
+    public List<SmileSchool> schoolList() {
+        return smileSchoolMapper.selectList(null);
+    }
+
+    @Override
+    public SmileSchool getSchoolById(Long id) {
+        return smileSchoolMapper.selectById(id);
+    }
+
+    @Override
+    public Integer create(SmileSchool smileSchool) {
+        log.info("smileSchool:{}",smileSchool);
+        return smileSchoolMapper.insert(smileSchool);
+    }
+
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -87,5 +87,4 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         return userVo;
     }
 
-
 }
\ No newline at end of file

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileOrganization.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -18,6 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@ToString
 public class SmileOrganization implements Serializable {
 
     private static final long serialVersionUID = 1L;

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileSchool.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -17,6 +18,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@ToString
 public class SmileSchool implements Serializable {
 
     private static final long serialVersionUID = 1L;

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileOrganizationMapper.java

@@ -14,4 +14,5 @@ import com.liquidnet.service.smile.entity.SmileOrganization;
  */
 public interface SmileOrganizationMapper extends BaseMapper<SmileOrganization> {
 
+    void update(SmileOrganization smileOrganization);
 }